diff --git a/CHANGES.txt b/CHANGES.txt
index 8873b054..1abde042 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -84,6 +84,8 @@
 * Patch 3476176: Remove conditionals from makefile compiler assignments (Konstantin Tokarev)
 * Pull 1: Fixed path to Info.plist in Xcode projects (Adrien Anselme)
 * Patch 3367642: Add support for targetextension property to Xcode
+* Patch 3435716: Fix for PS3 config generation in VS2010 (Jake)
+* Patch 3441850: Use debug.traceback() as error handler (Konstantin Tokarev)
 
 
 -------
diff --git a/src/host/premake.c b/src/host/premake.c
index 41d42f94..385dd1ba 100755
--- a/src/host/premake.c
+++ b/src/host/premake.c
@@ -318,10 +318,14 @@ int load_builtin_scripts(lua_State* L)
 		return !OKAY;
 	}
 
+	/* in debug mode, show full traceback on all errors */
+	lua_getglobal(L, "debug");
+	lua_getfield(L, -1, "traceback");
+
 	/* hand off control to the scripts */
 	lua_getglobal(L, "_premake_main");
 	lua_pushstring(L, scripts_path);
-	if (lua_pcall(L, 1, 1, 0) != OKAY)
+	if (lua_pcall(L, 1, 1, -3) != OKAY)
 	{
 		printf(ERROR_MESSAGE, lua_tostring(L, -1));
 		return !OKAY;