diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 9dde424df..e5ea997f2 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -36,13 +36,12 @@ WSSHClient.prototype.connect = function (options) {
     };
 
     this._connection.onmessage = function (evt) {
-        var data = JSON.parse(evt.data.toString());
-        if (data.error !== undefined) {
+        try{
+            options.onData(evt.data);
+        } catch (e) {
+            var data = JSON.parse(evt.data.toString());
             options.onError(data.error);
         }
-        else {
-            options.onData(data);
-        }
     };
 
     this._connection.onclose = function (evt) {