diff --git a/include/armadillo_bits/config.hpp b/include/armadillo_bits/config.hpp
index 27b51d93..c9475b4f 100644
--- a/include/armadillo_bits/config.hpp
+++ b/include/armadillo_bits/config.hpp
@@ -331,6 +331,13 @@
 #if defined(ARMA_DEBUG)
   #undef  ARMA_DONT_CHECK_CONFORMANCE
   #undef  ARMA_DONT_CHECK_NONFINITE
+  
+  #undef  ARMA_CHECK_CONFORMANCE
+  #define ARMA_CHECK_CONFORMANCE
+  
+  #undef  ARMA_CHECK_NONFINITE
+  #define ARMA_CHECK_NONFINITE
+  
   #undef  ARMA_WARN_LEVEL
   #define ARMA_WARN_LEVEL 3
 #endif
diff --git a/include/armadillo_bits/config.hpp.cmake b/include/armadillo_bits/config.hpp.cmake
index a874e9bb..31a230fa 100644
--- a/include/armadillo_bits/config.hpp.cmake
+++ b/include/armadillo_bits/config.hpp.cmake
@@ -331,6 +331,13 @@
 #if defined(ARMA_DEBUG)
   #undef  ARMA_DONT_CHECK_CONFORMANCE
   #undef  ARMA_DONT_CHECK_NONFINITE
+  
+  #undef  ARMA_CHECK_CONFORMANCE
+  #define ARMA_CHECK_CONFORMANCE
+  
+  #undef  ARMA_CHECK_NONFINITE
+  #define ARMA_CHECK_NONFINITE
+  
   #undef  ARMA_WARN_LEVEL
   #define ARMA_WARN_LEVEL 3
 #endif