diff --git a/app/SaveProject.js b/app/SaveProject.js
index 0e77adc..95ef547 100644
--- a/app/SaveProject.js
+++ b/app/SaveProject.js
@@ -54,9 +54,14 @@ class SaveProject {
     }
     static loadGamesystems(projectDir) {
         const gamesystemDir = path.join(projectDir, "gamesystems");
-        const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir);
-        console.log("LoadedGamesystems: ", loadedGamesystems.length);
-        return loadedGamesystems;
+        if (fs.existsSync(gamesystemDir)) {
+            const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir);
+            console.log("LoadedGamesystems: ", loadedGamesystems.length);
+            return loadedGamesystems;
+        }
+        else {
+            return [];
+        }
     }
     static loadGamesystemsRecursively(gamesystemDir) {
         let loadedGamesystems = [];
diff --git a/app/SaveProject.ts b/app/SaveProject.ts
index 7c010d3..a042f9e 100644
--- a/app/SaveProject.ts
+++ b/app/SaveProject.ts
@@ -62,9 +62,13 @@ export class SaveProject {
 
   static loadGamesystems(projectDir: string): LoadModel[] {
     const gamesystemDir = path.join(projectDir, "gamesystems");
-    const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir);
-    console.log("LoadedGamesystems: ", loadedGamesystems.length);
-    return loadedGamesystems;
+    if(fs.existsSync(gamesystemDir)) {
+      const loadedGamesystems = this.loadGamesystemsRecursively(gamesystemDir);
+      console.log("LoadedGamesystems: ", loadedGamesystems.length);
+      return loadedGamesystems;
+    } else {
+      return []
+    }
   }
 
   static loadGamesystemsRecursively(gamesystemDir: string): LoadModel[] {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b416d2c..ebfb04a 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -42,6 +42,9 @@ export class AppComponent implements OnInit{
               private dialog: MatDialog
   ) {
     console.log('APP_CONFIG', APP_CONFIG);
+    if(this.gameModel == undefined)  {
+      this.gameModel = new GameModel("Unknown GameModel")
+    }
 
     if (electronService.isElectron) {
       console.log(process.env);