diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index d827af8d..c214d7a1 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -324,11 +324,15 @@ namespace Vocaluxe.Base
             else
                 Config = xml.DeserializeString<SConfig>("<root />");
 
-            if (Config.Game.SongFolder.Length > 0)
+            if (Config.Game.SongFolder.Length > 0 && Config.Game.SongFolder[0] != "")
             {
                 SongFolders.Clear();
                 SongFolders.AddRange(Config.Game.SongFolder);
             }
+            else
+            {
+                Config.Game.SongFolder = SongFolders.ToArray();
+            }
             if ((Config.Game.ScoreAnimationTime > 0 && Config.Game.ScoreAnimationTime < 1) || Config.Game.ScoreAnimationTime < 0)
                 Config.Game.ScoreAnimationTime = 1;
 
diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs
index 25aa2cd4..3ad3a4ef 100644
--- a/Vocaluxe/Base/CSettings.cs
+++ b/Vocaluxe/Base/CSettings.cs
@@ -246,7 +246,7 @@ namespace Vocaluxe.Base
 
         private static void _CreateFolder(string path)
         {
-            if (!Directory.Exists(path))
+            if (path != "" && !Directory.Exists(path))
             {
                 try
                 {