diff --git a/ZAPDTR/ZAPD/Main.cpp b/ZAPDTR/ZAPD/Main.cpp
index a3e49e936..250704993 100644
--- a/ZAPDTR/ZAPD/Main.cpp
+++ b/ZAPDTR/ZAPD/Main.cpp
@@ -188,7 +188,16 @@ int main(int argc, char* argv[])
 		}
 		else if (arg == "-eh")  // Enable Error Handler
 		{
-			
+	#if !defined(_MSC_VER) && !defined(__CYGWIN__)
+			signal(SIGSEGV, ErrorHandler);
+			signal(SIGABRT, ErrorHandler);
+#else
+			// HANDLE_WARNING(WarningType::Always,
+			//                "tried to set error handler, but this ZAPD build lacks support for one",
+			//                "");
+#endif
+
+
 		}
 		else if (arg == "-v")  // Verbose
 		{