From b117f6749a8b513fd4ee0b2388a1233f3b067456 Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@vimperator.org>
Date: Sun, 8 Nov 2009 20:58:43 -0500
Subject: [PATCH] Just explicitly check bookmark node URIs for nullness. How
 does this even happen?

---
 common/content/bookmarks.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 14e6bc61..452d384d 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -60,20 +60,15 @@ const Bookmarks = Module("bookmarks", {
             this.__iterator__ = function () (val for ([, val] in Iterator(self.bookmarks)));
 
             function loadBookmark(node) {
-                try {
-                    let uri = util.newURI(node.uri);
-                    let keyword = bookmarksService.getKeywordForBookmark(node.itemId);
-                    let tags = tagging.getTagsForURI(uri, {}) || [];
-                    let bmark = new Bookmark(node.uri, node.title, node.icon && node.icon.spec, keyword, tags, node.itemId);
+                if (node.uri == null) // How does this happen?
+                    return false;
+                let uri = util.newURI(node.uri);
+                let keyword = bookmarksService.getKeywordForBookmark(node.itemId);
+                let tags = tagging.getTagsForURI(uri, {}) || [];
+                let bmark = new Bookmark(node.uri, node.title, node.icon && node.icon.spec, keyword, tags, node.itemId);
 
-                    bookmarks.push(bmark);
-                    return bmark;
-                }
-                catch (e) {
-                    liberator.dump("Failed to create bookmark for URI: " + node.uri);
-                    liberator.reportError(e);
-                    return null;
-                }
+                bookmarks.push(bmark);
+                return bmark;
             }
 
             function readBookmark(id) {