diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 0a8999c9d..11b42daeb 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -5076,6 +5076,7 @@ int glestMain(int argc, char** argv) {
 
 		ExceptionHandler::handleRuntimeError(ex.c_str(),true);
 	}
+#ifndef WIN32_STACK_TRACE
 	catch(...) {
 		if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) {
 			soundThreadManager = (program != NULL ? program->getSoundThreadManager(true) : NULL);
@@ -5086,9 +5087,9 @@ int glestMain(int argc, char** argv) {
 			}
 		}
 
-		ExceptionHandler::handleRuntimeError("Unknown error!",true);
+		ExceptionHandler::handleRuntimeError("Unknown error [main]!",true);
 	}
-
+#endif
 	cleanupCRCThread();
 
 	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
diff --git a/source/shared_lib/sources/lua/lua_script.cpp b/source/shared_lib/sources/lua/lua_script.cpp
index fe6c62d6c..b620761e3 100644
--- a/source/shared_lib/sources/lua/lua_script.cpp
+++ b/source/shared_lib/sources/lua/lua_script.cpp
@@ -620,7 +620,7 @@ string LuaScript::errorToString(int errorCode) {
 			error+= "Error while running the error handler"; 
 			break;
 		default:
-			error+= "Unknown error";
+			error+= "Unknown LUA error" + intToStr(errorCode);
 			break;
 	}
 
diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
index ffc7bb2c7..44a6f7ac5 100644
--- a/source/shared_lib/sources/platform/posix/socket.cpp
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -212,7 +212,7 @@ Mutex UPNP_Tools::mutexUPNP;
 		else
 		{
 			// Didn't find error in list, so make up a generic one
-			outs << "unknown error";
+			outs << "unknown socket error";
 		}
 		outs << " (" << Target.nID << ")";