--- a/src/thread_win32.cpp	Mon Jun 30 10:26:40 2008 +0000
+++ b/src/thread_win32.cpp	Mon Jun 30 10:40:50 2008 +0000
@@ -87,7 +87,7 @@
 		if (!IsRunning()) return false;
 
 		/* For now we terminate by throwing an error, gives much cleaner cleanup */
-		throw 0;
+		throw OTTDThreadExitSignal();
 	}
 
 	/* virtual */ void Join()
@@ -128,7 +128,9 @@
 	{
 		try {
 			m_proc(m_param);
+		} catch (OTTDExitSignal e) {
 		} catch (...) {
+			NOT_REACHED();
 		}
 	}
 };