diff --git a/src/CoinError.cpp b/src/CoinError.cpp
index 9cd00bd4..edc765ec 100644
--- a/src/CoinError.cpp
+++ b/src/CoinError.cpp
@@ -8,12 +8,14 @@ bool COINUTILSLIB_EXPORT CoinError::printErrors_ = false;
 
 /** A function to block the popup windows that windows creates when the code
     crashes */
-#ifdef HAVE_WINDOWS_H
+#ifdef _MSC_VER
 #include <windows.h>
+#include <stdlib.h>
 COINUTILSLIB_EXPORT
 void WindowsErrorPopupBlocker()
 {
   SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+  _set_abort_behavior(0, _WRITE_ABORT_MSG);
 }
 #else
 COINUTILSLIB_EXPORT
diff --git a/test/unitTest.cpp b/test/unitTest.cpp
index 0dd28306..b949476a 100644
--- a/test/unitTest.cpp
+++ b/test/unitTest.cpp
@@ -52,6 +52,9 @@ void testingMessage( const char * const msg );
 
 int main (int argc, const char *argv[])
 {
+  // Stop Windows popup
+  WindowsErrorPopupBlocker();
+  
   /*
     Set default location for Data directory, assuming traditional
     package layout.