diff --git a/config_base.h b/config_base.h
index 308eebfe..d5876851 100644
--- a/config_base.h
+++ b/config_base.h
@@ -86,10 +86,6 @@
 #define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
 #endif
 
-#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
-# define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE
-#endif
-
 // ***************** IA32 CPU features ********************
 
 #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
diff --git a/config_cxx.h b/config_cxx.h
index 75fac0ac..02823ce0 100644
--- a/config_cxx.h
+++ b/config_cxx.h
@@ -177,6 +177,10 @@
 # define NULLPTR NULL
 #endif // CRYPTOPP_CXX11_NULLPTR
 
+#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
+# define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE
+#endifss
+
 // OK to comment the following out, but please report it so we can fix it.
 // C++17 value taken from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4567.pdf.
 #if (defined(__cplusplus) && (__cplusplus >= 199711L) && (__cplusplus < 201402L)) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)