diff --git a/rts/System/SpringApp.cpp b/rts/System/SpringApp.cpp
index 7ab2efcdc8a..2997f2702cf 100644
--- a/rts/System/SpringApp.cpp
+++ b/rts/System/SpringApp.cpp
@@ -712,7 +712,11 @@ CGameController* SpringApp::LoadDemoFile(const std::string& demoFile)
 
 CGameController* SpringApp::RunScript(const std::string& buf)
 {
-	clientSetup->LoadFromStartScript(buf);
+	try {
+		clientSetup->LoadFromStartScript(buf);
+	} catch (const content_error& err) {
+		throw content_error(std::string("Invalid script file\n") + err.what());
+	}
 
 	if (!clientSetup->demoFile.empty())
 		return LoadDemoFile(clientSetup->demoFile);