diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index f1cecad4d82654829600bd215ba1a7881c1e4d05..65b7b5ffe0d97addbb99239956077aa8895b6ddf 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -148,7 +148,9 @@ int main(int argc, char **argv)
 			LoadLibraryA("exchndl.dll");
 		}
 	}
+#ifndef __MINGW32__
 	prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);
+#endif
 	MakeCodeWritable();
 #endif
 	// startup SRB2
diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg
index 99b8bc9b2ca4b6949944429546b3e379808e804a..3560af0c4f085475df6992c26a8b423b1d68e03f 100644
--- a/src/win32/Makefile.cfg
+++ b/src/win32/Makefile.cfg
@@ -64,7 +64,7 @@ endif
 
 ifdef SDL
 	i_system_o+=$(OBJDIR)/SRB2.res
-	i_main_o+=$(OBJDIR)/win_dbg.o
+	#i_main_o+=$(OBJDIR)/win_dbg.o
 ifndef NOHW
 	OPTS+=-DUSE_WGL_SWAP
 endif
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index 4bb3df868ff9176646463cb327a968e1492c58ae..6c774f5576dad667e64f990b2082df815049b563 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -666,7 +666,9 @@ int WINAPI WinMain (HINSTANCE hInstance,
 #endif
 			LoadLibraryA("exchndl.dll");
 
+#ifndef __MINGW32__
 		prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);
+#endif
 
 		Result = HandledWinMain(hInstance);
 #ifdef BUGTRAP