Prefer error continuations over exceptions

3 files changed, 5 insertions, 6 deletions

diff --git a/contexts/data/fiveui/entry.js b/contexts/data/fiveui/entry.js
index b2e7fd0..a41ba5f 100644
--- a/contexts/data/fiveui/entry.js
+++ b/contexts/data/fiveui/entry.js
@@ -223,6 +223,7 @@ fiveui.RuleSetEntry = Backbone.View.extend({
 
     editable(this.$el.find('.source'), this.model,
         'http://example.com/manifest.json')
+
     return this;
   },
 
@@ -231,7 +232,7 @@ fiveui.RuleSetEntry = Backbone.View.extend({
     this.model.set('source', source);
     this.model.save({}, {
       success: _.bind(this.render, this),
-      error:   _.bind(this.edit, this)
+      error:   _.bind(this.edit,   this)
     });
   },
 
diff --git a/contexts/data/fiveui/rules.js b/contexts/data/fiveui/rules.js
index e45d0d8..68d821d 100644
--- a/contexts/data/fiveui/rules.js
+++ b/contexts/data/fiveui/rules.js
@@ -157,7 +157,7 @@ fiveui.RuleSet.load = function(manifest_url, options) {
 
 
   } else {
-    throw "unable to parse manifest url";
+    options.error("unable to parse manifest url");
   }
 
 };
@@ -199,16 +199,14 @@ fiveui.RuleSetModel = Backbone.Model.extend({
         var rsMethod = method == 'update' ? 'updateRuleSet' : 'addRuleSet';
 
         msg.send('loadRuleSet', source, function(obj) {
-
           if(obj) {
             obj.id     = id;
             obj.source = source;
 
             msg.send(rsMethod, obj, options.success);
           } else {
-            options.error();
+            options.error('failed to load manifest');
           }
-
         });
         break;
 
diff --git a/contexts/data/fiveui/settings.js b/contexts/data/fiveui/settings.js
index 4154158..c284db8 100644
--- a/contexts/data/fiveui/settings.js
+++ b/contexts/data/fiveui/settings.js
@@ -337,7 +337,7 @@ fiveui.Settings.manager = function(chan, settings) {
       success:respond,
 
       error:function() {
-        respond({});
+        respond(null);
       },
     });
   });