diff --git a/src/RageFile.cpp b/src/RageFile.cpp
index c7e4b3a284..3a9ce764c6 100644
--- a/src/RageFile.cpp
+++ b/src/RageFile.cpp
@@ -346,6 +346,7 @@ class LunaRageFile: public Luna<RageFile>
 	static int destroy( T* p, lua_State *L )
 	{
 		SAFE_DELETE(p);
+		lua_pushboolean( L, true);
 		return 1;
 	}
 
@@ -358,6 +359,7 @@ class LunaRageFile: public Luna<RageFile>
 	static int Close( T* p, lua_State *L )
 	{
 		p->Close();
+		lua_pushboolean( L, true);
 		return 1;
 	}
 
diff --git a/src/ThemeManager.cpp b/src/ThemeManager.cpp
index 93dc10f367..2154918db7 100644
--- a/src/ThemeManager.cpp
+++ b/src/ThemeManager.cpp
@@ -881,7 +881,8 @@ bool ThemeManager::GetPathInfo( PathInfo &out, ElementCategory category, const R
 RString ThemeManager::GetPath( ElementCategory category, const RString &sMetricsGroup, const RString &sElement, bool bOptional )
 {
 	PathInfo pi;
-	GetPathInfo( pi, category, sMetricsGroup, sElement, bOptional );
+	if(!GetPathInfo( pi, category, sMetricsGroup, sElement, bOptional ))
+		return "";
 	if(!bOptional && pi.sResolvedPath.empty())
 	{
 		LuaHelpers::ReportScriptErrorFmt("Theme element not found and not "