Fix cryptic error message with certain :set args.

--HG--
extra : rebase_source : f555e2cb98bea80fd1090cae6199371f0ca997ed

2 files changed, 3 insertions, 0 deletions

diff --git a/common/modules/bookmarkcache.jsm b/common/modules/bookmarkcache.jsm
index afaa56b9..8f12b6a4 100644
--- a/common/modules/bookmarkcache.jsm
+++ b/common/modules/bookmarkcache.jsm
@@ -30,6 +30,8 @@ update(Bookmark.prototype, {
 })
 Bookmark.setter = function (key, func) this.prototype.__defineSetter__(key, func);
 Bookmark.setter("url", function (val) {
+    if (isString(val))
+        val = util.newURI(val);
     let tags = this.tags;
     this.tags = null;
     services.bookmarks.changeBookmarkURI(this.id, val);
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 3672f7eb..e22715e0 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -1082,6 +1082,7 @@ var Options = Module("options", {
 
                 let opt = modules.options.parseOpt(arg, modifiers);
                 util.assert(opt, _("command.set.errorParsing", arg));
+                util.assert(!opt.error, _("command.set.errorParsing", opt.error));
 
                 let option = opt.option;
                 util.assert(option != null || opt.all, _("command.set.unknownOption", opt.name));