diff --git a/include/armadillo_bits/fn_chol.hpp b/include/armadillo_bits/fn_chol.hpp
index 01caa2db..2dc5d8ea 100644
--- a/include/armadillo_bits/fn_chol.hpp
+++ b/include/armadillo_bits/fn_chol.hpp
@@ -61,7 +61,7 @@ chol
   if(status == false)
     {
     out.soft_reset();
-    arma_debug_warn("chol(): decomposition failed");
+    arma_extra_warn("chol(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_eig_gen.hpp b/include/armadillo_bits/fn_eig_gen.hpp
index 0a0bdd69..c39930cd 100644
--- a/include/armadillo_bits/fn_eig_gen.hpp
+++ b/include/armadillo_bits/fn_eig_gen.hpp
@@ -83,7 +83,7 @@ eig_gen
   if(status == false)
     {
     eigvals.soft_reset();
-    arma_debug_warn("eig_gen(): decomposition failed");
+    arma_extra_warn("eig_gen(): decomposition failed");
     }
   
   return status;
@@ -118,7 +118,7 @@ eig_gen
     {
     eigvals.soft_reset();
     eigvecs.soft_reset();
-    arma_debug_warn("eig_gen(): decomposition failed");
+    arma_extra_warn("eig_gen(): decomposition failed");
     }
   
   return status;
@@ -157,7 +157,7 @@ eig_gen
      eigvals.soft_reset();
     leigvecs.soft_reset();
     reigvecs.soft_reset();
-    arma_debug_warn("eig_gen(): decomposition failed");
+    arma_extra_warn("eig_gen(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_eig_pair.hpp b/include/armadillo_bits/fn_eig_pair.hpp
index b7c390ac..56f7b151 100644
--- a/include/armadillo_bits/fn_eig_pair.hpp
+++ b/include/armadillo_bits/fn_eig_pair.hpp
@@ -69,7 +69,7 @@ eig_pair
   if(status == false)
     {
     eigvals.soft_reset();
-    arma_debug_warn("eig_pair(): decomposition failed");
+    arma_extra_warn("eig_pair(): decomposition failed");
     }
   
   return status;
@@ -98,7 +98,7 @@ eig_pair
     {
     eigvals.soft_reset();
     eigvecs.soft_reset();
-    arma_debug_warn("eig_pair(): decomposition failed");
+    arma_extra_warn("eig_pair(): decomposition failed");
     }
   
   return status;
@@ -131,7 +131,7 @@ eig_pair
      eigvals.soft_reset();
     leigvecs.soft_reset();
     reigvecs.soft_reset();
-    arma_debug_warn("eig_pair(): decomposition failed");
+    arma_extra_warn("eig_pair(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_eig_sym.hpp b/include/armadillo_bits/fn_eig_sym.hpp
index 5b212993..e0a17814 100644
--- a/include/armadillo_bits/fn_eig_sym.hpp
+++ b/include/armadillo_bits/fn_eig_sym.hpp
@@ -38,7 +38,7 @@ eig_sym
   if(status == false)
     {
     eigval.soft_reset();
-    arma_debug_warn("eig_sym(): decomposition failed");
+    arma_extra_warn("eig_sym(): decomposition failed");
     }
   
   return status;
@@ -145,7 +145,7 @@ eig_sym
     {
     eigval.soft_reset();
     eigvec.soft_reset();
-    arma_debug_warn("eig_sym(): decomposition failed");
+    arma_extra_warn("eig_sym(): decomposition failed");
     }
   else
     {
diff --git a/include/armadillo_bits/fn_eigs_gen.hpp b/include/armadillo_bits/fn_eigs_gen.hpp
index 78357b8c..9d9872d5 100644
--- a/include/armadillo_bits/fn_eigs_gen.hpp
+++ b/include/armadillo_bits/fn_eigs_gen.hpp
@@ -177,7 +177,7 @@ eigs_gen
   if(status == false)
     {
     eigval.soft_reset();
-    arma_debug_warn("eigs_gen(): decomposition failed");
+    arma_extra_warn("eigs_gen(): decomposition failed");
     }
   
   return status;
@@ -243,7 +243,7 @@ eigs_gen
   if(status == false)
     {
     eigval.soft_reset();
-    arma_debug_warn("eigs_gen(): decomposition failed");
+    arma_extra_warn("eigs_gen(): decomposition failed");
     }
   
   return status;
@@ -274,7 +274,7 @@ eigs_gen
   if(status == false)
     {
     eigval.soft_reset();
-    arma_debug_warn("eigs_gen(): decomposition failed");
+    arma_extra_warn("eigs_gen(): decomposition failed");
     }
   
   return status;
@@ -310,7 +310,7 @@ eigs_gen
     {
     eigval.soft_reset();
     eigvec.soft_reset();
-    arma_debug_warn("eigs_gen(): decomposition failed");
+    arma_extra_warn("eigs_gen(): decomposition failed");
     }
   
   return status;
@@ -379,7 +379,7 @@ eigs_gen
     {
     eigval.soft_reset();
     eigvec.soft_reset();
-    arma_debug_warn("eigs_gen(): decomposition failed");
+    arma_extra_warn("eigs_gen(): decomposition failed");
     }
   
   return status;
@@ -412,7 +412,7 @@ eigs_gen
     {
     eigval.soft_reset();
     eigvec.soft_reset();
-    arma_debug_warn("eigs_gen(): decomposition failed");
+    arma_extra_warn("eigs_gen(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_eigs_sym.hpp b/include/armadillo_bits/fn_eigs_sym.hpp
index 44eb4b96..88aaf7fe 100644
--- a/include/armadillo_bits/fn_eigs_sym.hpp
+++ b/include/armadillo_bits/fn_eigs_sym.hpp
@@ -130,7 +130,7 @@ eigs_sym
   if(status == false)
     {
     eigval.soft_reset();
-    arma_debug_warn("eigs_sym(): decomposition failed");
+    arma_extra_warn("eigs_sym(): decomposition failed");
     }
   
   return status;
@@ -185,7 +185,7 @@ eigs_sym
   if(status == false)
     {
     eigval.soft_reset();
-    arma_debug_warn("eigs_sym(): decomposition failed");
+    arma_extra_warn("eigs_sym(): decomposition failed");
     }
   
   return status;
@@ -219,7 +219,7 @@ eigs_sym
     {
     eigval.soft_reset();
     eigvec.soft_reset();
-    arma_debug_warn("eigs_sym(): decomposition failed");
+    arma_extra_warn("eigs_sym(): decomposition failed");
     }
   
   return status;
@@ -277,7 +277,7 @@ eigs_sym
     {
     eigval.soft_reset();
     eigvec.soft_reset();
-    arma_debug_warn("eigs_sym(): decomposition failed");
+    arma_extra_warn("eigs_sym(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_expmat.hpp b/include/armadillo_bits/fn_expmat.hpp
index 055d310f..0ef77f6b 100644
--- a/include/armadillo_bits/fn_expmat.hpp
+++ b/include/armadillo_bits/fn_expmat.hpp
@@ -52,12 +52,11 @@ expmat(Mat<typename T1::elem_type>& B, const Base<typename T1::elem_type,T1>& A)
   
   if(status == false)
     {
-    arma_debug_warn("expmat(): given matrix appears ill-conditioned");
     B.soft_reset();
-    return false;
+    arma_extra_warn("expmat(): given matrix appears ill-conditioned");
     }
   
-  return true;
+  return status;
   }
 
 
@@ -91,7 +90,7 @@ expmat_sym(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T1>
   if(status == false)
     {
     Y.soft_reset();
-    arma_debug_warn("expmat_sym(): transformation failed");
+    arma_extra_warn("expmat_sym(): transformation failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_hess.hpp b/include/armadillo_bits/fn_hess.hpp
index bf80005d..7f22602a 100644
--- a/include/armadillo_bits/fn_hess.hpp
+++ b/include/armadillo_bits/fn_hess.hpp
@@ -48,7 +48,7 @@ hess
   if(status == false)
     {
     H.soft_reset();
-    arma_debug_warn("hess(): decomposition failed");
+    arma_extra_warn("hess(): decomposition failed");
     }
   
   return status;
@@ -161,7 +161,7 @@ hess
     {
     U.soft_reset();
     H.soft_reset();
-    arma_debug_warn("hess(): decomposition failed");
+    arma_extra_warn("hess(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_logmat.hpp b/include/armadillo_bits/fn_logmat.hpp
index f32d25d6..77736342 100644
--- a/include/armadillo_bits/fn_logmat.hpp
+++ b/include/armadillo_bits/fn_logmat.hpp
@@ -57,7 +57,7 @@ logmat(Mat< std::complex<typename T1::elem_type> >& Y, const Base<typename T1::e
   if(status == false)
     {
     Y.soft_reset();
-    arma_debug_warn("logmat(): transformation failed");
+    arma_extra_warn("logmat(): transformation failed");
     }
   
   return status;
@@ -77,7 +77,7 @@ logmat(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T1>& X,
   if(status == false)
     {
     Y.soft_reset();
-    arma_debug_warn("logmat(): transformation failed");
+    arma_extra_warn("logmat(): transformation failed");
     }
   
   return status;
@@ -114,7 +114,7 @@ logmat_sympd(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T
   if(status == false)
     {
     Y.soft_reset();
-    arma_debug_warn("logmat_sympd(): transformation failed");
+    arma_extra_warn("logmat_sympd(): transformation failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_lu.hpp b/include/armadillo_bits/fn_lu.hpp
index e2cfed9e..7fd77443 100644
--- a/include/armadillo_bits/fn_lu.hpp
+++ b/include/armadillo_bits/fn_lu.hpp
@@ -42,7 +42,7 @@ lu
     {
     L.soft_reset();
     U.soft_reset();
-    arma_debug_warn("lu(): decomposition failed");
+    arma_extra_warn("lu(): decomposition failed");
     }
   
   return status;
@@ -75,7 +75,7 @@ lu
     L.soft_reset();
     U.soft_reset();
     P.soft_reset();
-    arma_debug_warn("lu(): decomposition failed");
+    arma_extra_warn("lu(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_orth_null.hpp b/include/armadillo_bits/fn_orth_null.hpp
index c48580ec..1ba978c3 100644
--- a/include/armadillo_bits/fn_orth_null.hpp
+++ b/include/armadillo_bits/fn_orth_null.hpp
@@ -45,7 +45,8 @@ orth(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_type, T1>& X
   
   if(status == false)
     {
-    arma_debug_warn("orth(): svd failed");
+    out.soft_reset();
+    arma_extra_warn("orth(): svd failed");
     }
   
   return status;
@@ -83,7 +84,8 @@ null(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_type, T1>& X
   
   if(status == false)
     {
-    arma_debug_warn("null(): svd failed");
+    out.soft_reset();
+    arma_extra_warn("null(): svd failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_pinv.hpp b/include/armadillo_bits/fn_pinv.hpp
index 96f20eca..54ef3b4b 100644
--- a/include/armadillo_bits/fn_pinv.hpp
+++ b/include/armadillo_bits/fn_pinv.hpp
@@ -80,7 +80,8 @@ pinv
   
   if(status == false)
     {
-    arma_debug_warn("pinv(): svd failed");
+    out.soft_reset();
+    arma_extra_warn("pinv(): svd failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_polyfit.hpp b/include/armadillo_bits/fn_polyfit.hpp
index 1ff1be07..40c21e5a 100644
--- a/include/armadillo_bits/fn_polyfit.hpp
+++ b/include/armadillo_bits/fn_polyfit.hpp
@@ -36,7 +36,7 @@ polyfit(Mat<typename T1::elem_type>& out, const Base<typename T1::elem_type, T1>
   if(status == false)
     {
     out.soft_reset();
-    arma_debug_warn("polyfit(): failed");
+    arma_extra_warn("polyfit(): failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_princomp.hpp b/include/armadillo_bits/fn_princomp.hpp
index f681d3ca..f347b67d 100644
--- a/include/armadillo_bits/fn_princomp.hpp
+++ b/include/armadillo_bits/fn_princomp.hpp
@@ -50,7 +50,7 @@ princomp
     latent_out.soft_reset();
     tsquared_out.soft_reset();
     
-    arma_debug_warn("princomp(): decomposition failed");
+    arma_extra_warn("princomp(): decomposition failed");
     }
   
   return status;
@@ -86,7 +86,7 @@ princomp
     score_out.soft_reset();
     latent_out.soft_reset();
     
-    arma_debug_warn("princomp(): decomposition failed");
+    arma_extra_warn("princomp(): decomposition failed");
     }
   
   return status;
@@ -119,7 +119,7 @@ princomp
     coeff_out.soft_reset();
     score_out.soft_reset();
     
-    arma_debug_warn("princomp(): decomposition failed");
+    arma_extra_warn("princomp(): decomposition failed");
     }
   
   return status;
@@ -149,7 +149,7 @@ princomp
     {
     coeff_out.soft_reset();
     
-    arma_debug_warn("princomp(): decomposition failed");
+    arma_extra_warn("princomp(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_qr.hpp b/include/armadillo_bits/fn_qr.hpp
index fa5b461d..ec86d610 100644
--- a/include/armadillo_bits/fn_qr.hpp
+++ b/include/armadillo_bits/fn_qr.hpp
@@ -42,7 +42,7 @@ qr
     {
     Q.soft_reset();
     R.soft_reset();
-    arma_debug_warn("qr(): decomposition failed");
+    arma_extra_warn("qr(): decomposition failed");
     }
   
   return status;
@@ -73,7 +73,7 @@ qr_econ
     {
     Q.soft_reset();
     R.soft_reset();
-    arma_debug_warn("qr_econ(): decomposition failed");
+    arma_extra_warn("qr_econ(): decomposition failed");
     }
   
   return status;
@@ -132,7 +132,7 @@ qr
     Q.soft_reset();
     R.soft_reset();
     P.soft_reset();
-    arma_debug_warn("qr(): decomposition failed");
+    arma_extra_warn("qr(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_qz.hpp b/include/armadillo_bits/fn_qz.hpp
index 707de412..b17a1aa5 100644
--- a/include/armadillo_bits/fn_qz.hpp
+++ b/include/armadillo_bits/fn_qz.hpp
@@ -53,7 +53,7 @@ qz
     BB.soft_reset();
     Q.soft_reset();
     Z.soft_reset();
-    arma_debug_warn("qz(): decomposition failed");
+    arma_extra_warn("qz(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_roots.hpp b/include/armadillo_bits/fn_roots.hpp
index b6fa537a..0691a005 100644
--- a/include/armadillo_bits/fn_roots.hpp
+++ b/include/armadillo_bits/fn_roots.hpp
@@ -51,7 +51,11 @@ roots(Mat< std::complex<typename T1::pod_type> >& out, const Base<typename T1::e
   
   const bool status = op_roots::apply_direct(out, X.get_ref());
   
-  if(status == false)  { arma_debug_warn("roots(): eigen decomposition failed"); }
+  if(status == false)
+    {
+    out.soft_reset();
+    arma_extra_warn("roots(): eigen decomposition failed");
+    }
   
   return status;
   }
diff --git a/include/armadillo_bits/fn_schur.hpp b/include/armadillo_bits/fn_schur.hpp
index a6949cf9..879080be 100644
--- a/include/armadillo_bits/fn_schur.hpp
+++ b/include/armadillo_bits/fn_schur.hpp
@@ -40,7 +40,7 @@ schur
   if(status == false)
     {
     S.soft_reset();
-    arma_debug_warn("schur(): decomposition failed");
+    arma_extra_warn("schur(): decomposition failed");
     }
   
   return status;
@@ -101,7 +101,7 @@ schur
     {
     U.soft_reset();
     S.soft_reset();
-    arma_debug_warn("schur(): decomposition failed");
+    arma_extra_warn("schur(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_sqrtmat.hpp b/include/armadillo_bits/fn_sqrtmat.hpp
index 9da3d5a5..f079e860 100644
--- a/include/armadillo_bits/fn_sqrtmat.hpp
+++ b/include/armadillo_bits/fn_sqrtmat.hpp
@@ -56,7 +56,7 @@ sqrtmat(Mat< std::complex<typename T1::elem_type> >& Y, const Base<typename T1::
   
   if(status == false)
     {
-    arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
+    arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
     }
   
   return status;
@@ -75,7 +75,7 @@ sqrtmat(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,T1>& X
   
   if(status == false)
     {
-    arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
+    arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
     }
   
   return status;
@@ -112,7 +112,7 @@ sqrtmat_sympd(Mat<typename T1::elem_type>& Y, const Base<typename T1::elem_type,
   if(status == false)
     {
     Y.soft_reset();
-    arma_debug_warn("sqrtmat_sympd(): transformation failed");
+    arma_extra_warn("sqrtmat_sympd(): transformation failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_svd.hpp b/include/armadillo_bits/fn_svd.hpp
index d623cc10..99c67111 100644
--- a/include/armadillo_bits/fn_svd.hpp
+++ b/include/armadillo_bits/fn_svd.hpp
@@ -41,7 +41,7 @@ svd
   if(status == false)
     {
     S.soft_reset();
-    arma_debug_warn("svd(): decomposition failed");
+    arma_extra_warn("svd(): decomposition failed");
     }
   
   return status;
@@ -119,7 +119,7 @@ svd
     U.soft_reset();
     S.soft_reset();
     V.soft_reset();
-    arma_debug_warn("svd(): decomposition failed");
+    arma_extra_warn("svd(): decomposition failed");
     }
   
   return status;
@@ -171,7 +171,7 @@ svd_econ
     U.soft_reset();
     S.soft_reset();
     V.soft_reset();
-    arma_debug_warn("svd_econ(): decomposition failed");
+    arma_extra_warn("svd_econ(): decomposition failed");
     }
   
   return status;
diff --git a/include/armadillo_bits/fn_svds.hpp b/include/armadillo_bits/fn_svds.hpp
index 6f08f4b0..89823c28 100644
--- a/include/armadillo_bits/fn_svds.hpp
+++ b/include/armadillo_bits/fn_svds.hpp
@@ -282,7 +282,7 @@ svds
   
   const bool status = svds_helper(U, S, V, X.get_ref(), k, tol, true);
   
-  if(status == false)  { arma_debug_warn("svds(): decomposition failed"); }
+  if(status == false)  { arma_extra_warn("svds(): decomposition failed"); }
 
   return status;
   }
@@ -310,7 +310,7 @@ svds
   
   const bool status = svds_helper(U, S, V, X.get_ref(), k, tol, false);
   
-  if(status == false)  { arma_debug_warn("svds(): decomposition failed"); }
+  if(status == false)  { arma_extra_warn("svds(): decomposition failed"); }
   
   return status;
   }
diff --git a/include/armadillo_bits/fn_sylvester.hpp b/include/armadillo_bits/fn_sylvester.hpp
index 61eac2a3..7d0870d3 100644
--- a/include/armadillo_bits/fn_sylvester.hpp
+++ b/include/armadillo_bits/fn_sylvester.hpp
@@ -49,7 +49,7 @@ syl
   if(status == false)
     {
     out.soft_reset();
-    arma_debug_warn("syl(): solution not found");
+    arma_extra_warn("syl(): solution not found");
     }
   
   return status;
diff --git a/include/armadillo_bits/op_orth_null_meat.hpp b/include/armadillo_bits/op_orth_null_meat.hpp
index 4664b0f0..e0c952cc 100644
--- a/include/armadillo_bits/op_orth_null_meat.hpp
+++ b/include/armadillo_bits/op_orth_null_meat.hpp
@@ -35,6 +35,7 @@ op_orth::apply(Mat<typename T1::elem_type>& out, const Op<T1, op_orth>& expr)
   
   if(status == false)
     {
+    out.soft_reset();
     arma_stop_runtime_error("orth(): svd failed");
     }
   }
@@ -63,7 +64,7 @@ op_orth::apply_direct(Mat<typename T1::elem_type>& out, const Base<typename T1::
   
   V.reset();
   
-  if(status == false)  { out.soft_reset(); return false; }
+  if(status == false)  { return false; }
   
   if(s.is_empty())  { out.reset(); return true; }
   
@@ -110,6 +111,7 @@ op_null::apply(Mat<typename T1::elem_type>& out, const Op<T1, op_null>& expr)
   
   if(status == false)
     {
+    out.soft_reset();
     arma_stop_runtime_error("null(): svd failed");
     }
   }
@@ -138,7 +140,7 @@ op_null::apply_direct(Mat<typename T1::elem_type>& out, const Base<typename T1::
   
   U.reset();
   
-  if(status == false)  { out.soft_reset(); return false; }
+  if(status == false)  { return false; }
   
   if(s.is_empty())  { out.reset(); return true; }
   
diff --git a/include/armadillo_bits/op_pinv_meat.hpp b/include/armadillo_bits/op_pinv_meat.hpp
index c0503546..457b5a5c 100644
--- a/include/armadillo_bits/op_pinv_meat.hpp
+++ b/include/armadillo_bits/op_pinv_meat.hpp
@@ -36,6 +36,7 @@ op_pinv::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_pinv>& in)
   
   if(status == false)
     {
+    out.soft_reset();
     arma_stop_runtime_error("pinv(): svd failed");
     }
   }
@@ -96,7 +97,7 @@ op_pinv::apply_direct(Mat<typename T1::elem_type>& out, const Base<typename T1::
   
   const bool status = (method_id == uword(2)) ? auxlib::svd_dc_econ(U, s, V, A) : auxlib::svd_econ(U, s, V, A, 'b');
   
-  if(status == false)  { out.soft_reset(); return false; }
+  if(status == false)  { return false; }
   
   const uword s_n_elem = s.n_elem;
   const T*    s_mem    = s.memptr();
diff --git a/include/armadillo_bits/op_roots_meat.hpp b/include/armadillo_bits/op_roots_meat.hpp
index b2d8ca27..6231ff21 100644
--- a/include/armadillo_bits/op_roots_meat.hpp
+++ b/include/armadillo_bits/op_roots_meat.hpp
@@ -28,7 +28,11 @@ op_roots::apply(Mat< std::complex<typename T1::pod_type> >& out, const mtOp<std:
   
   const bool status = op_roots::apply_direct(out, expr.m);
   
-  if(status == false)  { arma_stop_runtime_error("roots(): eigen decomposition failed"); }
+  if(status == false)
+    {
+    out.soft_reset();
+    arma_stop_runtime_error("roots(): eigen decomposition failed");
+    }
   }
 
 
@@ -59,8 +63,6 @@ op_roots::apply_direct(Mat< std::complex<typename T1::pod_type> >& out, const Ba
     status = op_roots::apply_noalias(out, U.M);
     }
   
-  if(status == false)  { out.soft_reset(); }
-  
   return status;
   }
 
diff --git a/include/armadillo_bits/op_sqrtmat_meat.hpp b/include/armadillo_bits/op_sqrtmat_meat.hpp
index 132bfc96..6c4fb1f3 100644
--- a/include/armadillo_bits/op_sqrtmat_meat.hpp
+++ b/include/armadillo_bits/op_sqrtmat_meat.hpp
@@ -38,7 +38,7 @@ op_sqrtmat::apply(Mat< std::complex<typename T1::elem_type> >& out, const mtOp<s
   
   if(status == false)
     {
-    arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
+    arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
     }
   }
 
@@ -225,7 +225,7 @@ op_sqrtmat_cx::apply(Mat<typename T1::elem_type>& out, const Op<T1,op_sqrtmat_cx
   
   if(status == false)
     {
-    arma_debug_warn("sqrtmat(): given matrix seems singular; may not have a square root");
+    arma_extra_warn("sqrtmat(): given matrix seems singular; may not have a square root");
     }
   }
 
diff --git a/include/armadillo_bits/running_stat_meat.hpp b/include/armadillo_bits/running_stat_meat.hpp
index ed029463..6c2c5fb2 100644
--- a/include/armadillo_bits/running_stat_meat.hpp
+++ b/include/armadillo_bits/running_stat_meat.hpp
@@ -162,7 +162,7 @@ running_stat<eT>::operator() (const typename running_stat<eT>::T sample)
   
   if( arma_isfinite(sample) == false )
     {
-    arma_debug_warn("running_stat: sample ignored as it is non-finite" );
+    arma_extra_warn("running_stat: sample ignored as it is non-finite" );
     return;
     }
   
@@ -181,7 +181,7 @@ running_stat<eT>::operator() (const std::complex< typename running_stat<eT>::T >
   
   if( arma_isfinite(sample) == false )
     {
-    arma_debug_warn("running_stat: sample ignored as it is non-finite" );
+    arma_extra_warn("running_stat: sample ignored as it is non-finite" );
     return;
     }
   
diff --git a/include/armadillo_bits/running_stat_vec_meat.hpp b/include/armadillo_bits/running_stat_vec_meat.hpp
index f35aff8f..617f35c9 100644
--- a/include/armadillo_bits/running_stat_vec_meat.hpp
+++ b/include/armadillo_bits/running_stat_vec_meat.hpp
@@ -99,7 +99,7 @@ running_stat_vec<obj_type>::operator() (const Base<typename running_stat_vec<obj
   
   if( sample.is_finite() == false )
     {
-    arma_debug_warn("running_stat_vec: sample ignored as it has non-finite elements");
+    arma_extra_warn("running_stat_vec: sample ignored as it has non-finite elements");
     return;
     }
   
@@ -128,7 +128,7 @@ running_stat_vec<obj_type>::operator() (const Base< std::complex<typename runnin
   
   if( sample.is_finite() == false )
     {
-    arma_debug_warn("running_stat_vec: sample ignored as it has non-finite elements");
+    arma_extra_warn("running_stat_vec: sample ignored as it has non-finite elements");
     return;
     }