diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp
index 639dc1c4..1f0fe32d 100644
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -30,7 +30,8 @@
 #   define BOOST_NO_TEMPLATE_TEMPLATES
 #endif 
 
-# if !defined(__EXCEPTIONS)
+// See also kai.hpp which checks a Kai-specific symbol for EH
+# if !defined(__KCC) && !defined(__EXCEPTIONS)
 #     define BOOST_NO_EXCEPTIONS
 # endif
 
diff --git a/include/boost/config/compiler/kai.hpp b/include/boost/config/compiler/kai.hpp
index 6b8ab84b..a7451936 100644
--- a/include/boost/config/compiler/kai.hpp
+++ b/include/boost/config/compiler/kai.hpp
@@ -14,6 +14,11 @@
 #     define BOOST_NO_STDC_NAMESPACE
 #   endif
 
+// see also common_edg.hpp which needs a special check for __KCC
+# if !defined(_EXCEPTIONS)
+#     define BOOST_NO_EXCEPTIONS
+# endif
+
 #define BOOST_COMPILER "Kai C++ version " BOOST_STRINGIZE(__KCC_VERSION)
 
 //