diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index d44e5230b..9679ca68c 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -445,7 +445,6 @@ std::unique_ptr<SaveFile> Client::LoadSaveFile(ByteString filename)
 		{
 			file->SetLoadingError(err.FromUtf8());
 		}
-		commandInterface->SetLastError(err.FromUtf8());
 	}
 	return file;
 }
diff --git a/src/lua/LuaScriptInterface.cpp b/src/lua/LuaScriptInterface.cpp
index 7d81f9eeb..c56308242 100644
--- a/src/lua/LuaScriptInterface.cpp
+++ b/src/lua/LuaScriptInterface.cpp
@@ -2232,7 +2232,7 @@ int LuaScriptInterface::simulation_loadStamp(lua_State * l)
 	{
 		pushed = 2;
 		lua_pushnil(l);
-		tpt_lua_pushString(l, luacon_ci->GetLastError());
+		tpt_lua_pushString(l, tempfile ? tempfile->GetError() : "does not exist");
 	}
 	return pushed;
 }