diff --git a/JGE/src/JFileSystem.cpp b/JGE/src/JFileSystem.cpp
index 20739aebc..a42336a33 100644
--- a/JGE/src/JFileSystem.cpp
+++ b/JGE/src/JFileSystem.cpp
@@ -196,6 +196,8 @@ bool JFileSystem::DirExists(const string& strDirname)
 
 bool JFileSystem::FileExists(const string& strFilename)
 { 
+    if (strFilename.length() < 1 ) return false;
+    
     return (mSystemFS && mSystemFS->FileExists(strFilename)) || mUserFS->FileExists(strFilename);
 }
 
diff --git a/JGE/src/zipFS/zfsystem.cpp b/JGE/src/zipFS/zfsystem.cpp
index 51e8d8c9c..b8ef786d9 100644
--- a/JGE/src/zipFS/zfsystem.cpp
+++ b/JGE/src/zipFS/zfsystem.cpp
@@ -299,6 +299,7 @@ bool filesystem::DirExists(const std::string & folderName)
 
 bool filesystem::FileExists(const std::string & fileName)
 {
+    if (fileName.length() < 1) return false;
     //Check in zip
 	file_info FileInfo;
 
diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp
index c6b6ba09f..04c30e6a0 100644
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -242,7 +242,10 @@ void GameStateDuel::End()
 //TODO Move This to utils or ResourceManager. Don't we have more generic functions that can do that?
 bool GameStateDuel::MusicExist(string FileName)
 {
-    return FileExists(WResourceManager::Instance()->musicFile(FileName));
+    string musicFilename = WResourceManager::Instance()->musicFile(FileName);
+    if (musicFilename.length() < 1) return false;
+    
+    return FileExists(musicFilename);
 }
 
 void GameStateDuel::ConstructOpponentMenu()
@@ -438,7 +441,8 @@ void GameStateDuel::Update(float dt)
             else if (mParent->gameType == GAME_TYPE_RANDOM1 || mParent->gameType == GAME_TYPE_RANDOM2) musictrack
                 = "ai_baka_music_random.mp3";
 
-            if (!MusicExist(musictrack)) musictrack = "ai_baka_music.mp3";
+            if (!MusicExist(musictrack)) 
+                musictrack = "ai_baka_music.mp3";
 
             GameApp::playMusic(musictrack);
         }
diff --git a/projects/mtg/src/WResourceManager.cpp b/projects/mtg/src/WResourceManager.cpp
index 18bd68549..c08030975 100644
--- a/projects/mtg/src/WResourceManager.cpp
+++ b/projects/mtg/src/WResourceManager.cpp
@@ -754,7 +754,7 @@ string ResourceManagerImpl::musicFile(const string& filename)
     sprintf(defdir, "sound/%s", filename.c_str());
     if (fileOK(defdir)) return defdir;
 
-    //Failure. Check raw faile.
+    //Failure. Check raw file.
     sprintf(defdir, "%s", filename.c_str());
     if (fileOK(defdir)) return defdir;