diff --git a/uppsrc/Core/Mt.cpp b/uppsrc/Core/Mt.cpp
index 33b5f3d41..ee69d9b44 100644
--- a/uppsrc/Core/Mt.cpp
+++ b/uppsrc/Core/Mt.cpp
@@ -94,6 +94,10 @@ sThreadRoutine(void *arg)
 	}
 	catch(sThreadExitExc__) {}
 	catch(Upp::ExitExc) {}
+	catch(std::bad_alloc) {
+		extern char out_of_memory_message[200];
+		Panic(out_of_memory_message);
+	}
 	if(!p->noshutdown)
 		AtomicDec(sThreadCount);
 	delete p;