From fb14da16b7acb79cf8cc4746d2307ebf87336960 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 11 Mar 2016 11:07:22 -0800
Subject: [PATCH] Bug 1250784: Follow-up: Fix merge conflict in bookmarks API.
 r=me

MozReview-Commit-ID: 83I9WhoUZGj

--HG--
extra : rebase_source : ba869cf2940eb5c52697c4e1f145c3fadb909fd2
---
 browser/components/extensions/ext-bookmarks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/extensions/ext-bookmarks.js b/browser/components/extensions/ext-bookmarks.js
index 8f47ef9a59b3..6def753e674c 100644
--- a/browser/components/extensions/ext-bookmarks.js
+++ b/browser/components/extensions/ext-bookmarks.js
@@ -55,7 +55,7 @@ function getTree(rootGuid, onlyChildren) {
       // It seems like the array always just contains the root node.
       return [convert(root, null)];
     }
-  });
+  }).catch(e => Promise.reject({message: e.message}));
 }
 
 function convert(result) {