diff --git a/src/app/services/websocket.service.ts b/src/app/services/websocket.service.ts
index b3d5e4a..e4a5fed 100644
--- a/src/app/services/websocket.service.ts
+++ b/src/app/services/websocket.service.ts
@@ -41,14 +41,9 @@ export class WebSocketService {
   }
 
   public send(key: string, data?: any, trigger?: any): void {
-    // TODO: do this nicer?
     const message = {'key': key};
-    if (data) {
-      message['data'] = data;
-    }
-    if (trigger) {
-      message['trigger'] = trigger;
-    }
+    if (data) { message['data'] = data; }
+    if (trigger) { message['trigger'] = trigger; }
     this.uplink.next(message);
   }
 }
diff --git a/src/app/webide/webide.component.ts b/src/app/webide/webide.component.ts
index e9758ff..f4c2246 100644
--- a/src/app/webide/webide.component.ts
+++ b/src/app/webide/webide.component.ts
@@ -19,7 +19,7 @@ import { DeploymentNotificationService } from '../services/deployment-notificati
 
 const modelist = brace.acequire('ace/ext/modelist');
 
-const defaultSourceCode = 'Oops! Something went wrong :(';
+const defaultSourceCode = 'Loading your file...';
 const autosave_interval = 2000;
 
 @Component({
@@ -69,7 +69,7 @@ export class WebideComponent implements OnInit {
   updateFileData(data: SourceCode) {
     this.filename = data.filename;
     this.directory = data.directory;
-    this.code = data.content;
+    this.code = (data.content != null) ? data.content : this.code;
     this.language = modelist.getModeForPath(this.filename).name;
     this.files = data.files;
   }