diff --git a/Disco.Web/Models/InitialConfig/FileStoreModel.cs b/Disco.Web/Models/InitialConfig/FileStoreModel.cs
index 613ebeb2..614a0bac 100644
--- a/Disco.Web/Models/InitialConfig/FileStoreModel.cs
+++ b/Disco.Web/Models/InitialConfig/FileStoreModel.cs
@@ -40,6 +40,10 @@ namespace Disco.Web.Models.InitialConfig
                     }
                     else
                     {
+                        // Drive Letter doesn't exist
+                        if (branchParent.Path == null)
+                            break;
+
                         // New
                         branchModel = FileStoreDirectoryModel.FromNew(branchesCase[i], Path.Combine(branchParent.Path, branchesCase[i]));
                         branchParent.SubDirectories.Add(branchModel.Name.ToUpper(), branchModel);