diff --git a/src/main.cpp b/src/main.cpp
index ecdf69fa1..07f70635a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -165,6 +165,8 @@ int main(int argc, char* argv[])
 	if(!SystemData::loadConfig())
 	{
 		LOG(LogError) << "Error parsing system config file!";
+		if(!scrape_cmdline)
+			Renderer::deinit();
 		return 1;
 	}
 
@@ -172,6 +174,8 @@ int main(int argc, char* argv[])
 	if(SystemData::sSystemVector.size() == 0)
 	{
 		LOG(LogError) << "No systems found! Does at least one system have a game present? (check that extensions match!)\n(Also, make sure you've updated your es_systems.cfg for XML!)";
+		if(!scrape_cmdline)
+			Renderer::deinit();
 		return 1;
 	}