From 28e4252a005787deb2bde1f5ac2bcbc9b79ec766 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Tue, 24 Nov 2015 16:03:11 -0800
Subject: [PATCH] Fix errors breaking pipe

---
 client/commonFramework/end.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/client/commonFramework/end.js b/client/commonFramework/end.js
index 1c4a739a5b..0c9e914521 100644
--- a/client/commonFramework/end.js
+++ b/client/commonFramework/end.js
@@ -35,16 +35,21 @@ $(document).ready(function() {
             .flatMap(code => common.detectLoops$(code))
             .flatMap(
               ({ err }) => err ? Observable.throw(err) : Observable.just(code)
-            );
+            )
+            .flatMap(code => common.updatePreview$(code))
+            .catch(err => Observable.just({ err }));
         }
-        return Observable.just(code);
+        return Observable.just(code)
+          .flatMap(code => common.updatePreview$(code))
+          .catch(err => Observable.just({ err }));
       })
-      .flatMap(code => common.updatePreview$(code))
-      .catch(err => Observable.just({ err }))
       .subscribe(
         ({ err }) => {
           if (err) {
-            return console.error(err);
+            console.error(err);
+            return common.updatePreview$(`
+              <h1>${err}</h1>
+            `).subscribe(() => {});
           }
         },
         err => console.error(err)
@@ -57,15 +62,20 @@ $(document).ready(function() {
       common.editor.setValue(common.replaceSafeTags(common.seed));
     })
     .flatMap(() => {
-      return common.executeChallenge$();
+      return common.executeChallenge$()
+        .catch(err => Observable.just({ err }));
     })
     .subscribe(
-      ({ output, original }) => {
+      ({ err, output, original }) => {
+        if (err) {
+          console.error(err);
+          return common.updateOutputDisplay('' + err);
+        }
         common.codeStorage.updateStorage(challengeName, original);
         common.updateOutputDisplay('' + output);
       },
-      ({ err }) => {
-        if (err.stack) {
+      (err) => {
+        if (err) {
           console.error(err);
         }
         common.updateOutputDisplay('' + err);
@@ -83,7 +93,7 @@ $(document).ready(function() {
           const solved = tests.every(test => !test.err);
           return { ...rest, tests, solved };
         })
-        .catch(err => Observable.just(err));
+        .catch(err => Observable.just({ err }));
     })
     .subscribe(
       ({ err, solved, output, tests }) => {