diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
index d6a5d65b7b47f1bd48558066f1b7014501b6e504..e6a3c9f78f92d0b7b7433f9655c1ac12b7f00d37 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
@@ -33,12 +33,15 @@ export class RoomEditComponent implements OnInit {
   }
 
   ngOnInit() {
-    if (this.editRoom.extensions['comments'].commentThreshold != null) {
+    if (
+      this.editRoom.extensions &&
+      this.editRoom.extensions['comments'] &&
+      this.editRoom.extensions['comments'].commentThreshold != null
+    ) {
       this.commentThreshold = this.editRoom.extensions['comments'].commentThreshold;
     } else {
       this.commentThreshold = -10;
     }
-    console.log(this.editRoom);
   }
 
   onSliderChange(event: any) {
@@ -67,7 +70,7 @@ export class RoomEditComponent implements OnInit {
       this.notificationService.show(room.name + msg);
     });
     this.roomService.deleteRoom(room.id).subscribe();
-    this.dialogRef.close();
+    this.dialogRef.close('delete');
     this.router.navigate([`/creator`]);
   }
 
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
index 9437f1d71c9a70674ebd301340f7ced77c806d8f..c670b14b924d8ac6d67c4bbcc181eea57006460a 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -70,7 +70,7 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni
       .subscribe(result => {
         if (result === 'abort') {
           return;
-        } else {
+        } else if (result !== 'delete') {
           this.updateRoom(+result);
         }
       });