diff --git a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp
index f5595723d..ec45131df 100644
--- a/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp
+++ b/Unreal/CarlaUnreal/Plugins/Carla/Source/Carla/Carla.cpp
@@ -124,7 +124,7 @@ IMPLEMENT_MODULE(FCarlaModule, Carla)
 // -- Implement carla throw_exception ------------------------------------------
 // =============================================================================
 
-#ifndef __cpp_exceptions
+#ifdef LIBCARLA_NO_EXCEPTIONS
 #include <compiler/disable-ue4-macros.h>
 #include <carla/Exception.h>
 #include <compiler/enable-ue4-macros.h>
diff --git a/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp
index 3fadb6bbc..71ff7b7e4 100644
--- a/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp
+++ b/Unreal/CarlaUnreal/Plugins/CarlaTools/Source/CarlaTools/Private/CarlaTools.cpp
@@ -21,7 +21,7 @@ void FCarlaToolsModule::ShutdownModule()
 	
 IMPLEMENT_MODULE(FCarlaToolsModule, CarlaTools)
 
-#ifndef __cpp_exceptions
+#ifdef LIBCARLA_NO_EXCEPTIONS
 #include <compiler/disable-ue4-macros.h>
 #include <carla/Exception.h>
 #include <compiler/enable-ue4-macros.h>