diff --git a/src/app/editor/gamesystem-editor/gamesystem-editor.component.html b/src/app/editor/gamesystem-editor/gamesystem-editor.component.html
index 81b08a1..a055b2d 100644
--- a/src/app/editor/gamesystem-editor/gamesystem-editor.component.html
+++ b/src/app/editor/gamesystem-editor/gamesystem-editor.component.html
@@ -3,12 +3,12 @@
 <app-product-gamesystem-editor *ngIf="!isSimpleGamesystem()"  [templateElement]="templateElement" [gamesystem]="convertGamesystemToProductGamesystem()"
                                (onOpenGamesystemEditor)="onOpenGamesystemEditor($event)"></app-product-gamesystem-editor>
 
-<mat-expansion-panel>
+<mat-expansion-panel *ngIf="gamesystem != undefined">
   <mat-expansion-panel-header>
     <mat-panel-title>Product Generation Settings</mat-panel-title>
   </mat-expansion-panel-header>
   <div *ngIf="isGamesystemTemplate()">
     <mat-checkbox [(ngModel)]="convertGamesystemToTemplate(gamesystem)!.symmetric">Use symmetric Productgenerators</mat-checkbox>
   </div>
-  <mat-checkbox [(ngModel)]="gamesystem.generateIsolatedStates">Generate Isolated ProductStates</mat-checkbox>
+  <mat-checkbox [(ngModel)]="gamesystem!.generateIsolatedStates">Generate Isolated ProductStates</mat-checkbox>
 </mat-expansion-panel>