diff --git a/src/js/fields/advanced/EditorField.js b/src/js/fields/advanced/EditorField.js
index e788b2736..95e5cdbbb 100644
--- a/src/js/fields/advanced/EditorField.js
+++ b/src/js/fields/advanced/EditorField.js
@@ -363,7 +363,14 @@
                 }
                 else
                 {
-                    value = JSON.parse(value);
+                    //don't throw error if user entered bad json
+                    try {
+                      value = JSON.parse(value);
+                    }
+                    catch(err){
+                      //bad json
+                      value = null;
+                    }
                 }
             }