diff --git a/data/controls.dat b/data/controls.dat
index f0d4b46a3..fb65e0e81 100644
Binary files a/data/controls.dat and b/data/controls.dat differ
diff --git a/src/CGame.cpp b/src/CGame.cpp
index c622d5963..64a6f74fc 100644
--- a/src/CGame.cpp
+++ b/src/CGame.cpp
@@ -248,6 +248,12 @@ int CGame::loadResources(unsigned short Episode, char *DataDirectory)
 
     // Load tile attributes.
 	if(TileLoader) delete TileLoader;
+	
+	if(ExeFile->getData() == NULL) {
+		g_pLogFile->textOut(RED, "CGame::loadResources: Could not load data out of EXE<br>");
+		return 1;
+	}
+	
 	TileLoader = new CTileLoader(Episode, ExeFile->getEXEVersion(), ExeFile->getData());
 	if(!TileLoader->load()) return 1;