diff --git a/toolkit/components/places/PlacesUtils.jsm b/toolkit/components/places/PlacesUtils.jsm
index 1c2a9a85066b..b777fa0fbad0 100644
--- a/toolkit/components/places/PlacesUtils.jsm
+++ b/toolkit/components/places/PlacesUtils.jsm
@@ -1698,12 +1698,12 @@ let GUIDHelper = {
         if (row)
           itemId = row.getResultByIndex(0);
       },
-      handleCompletion: function (aReason) {
+      handleCompletion: aReason => {
         if (aReason == REASON_FINISHED && itemId != -1) {
-          deferred.resolve(itemId);
-
           this.ensureObservingRemovedItems();
           this.idsForGUIDs.set(aGUID, itemId);
+
+          deferred.resolve(itemId);
         }
         else if (itemId != -1) {
           deferred.reject("no item found for the given guid");
@@ -1719,7 +1719,7 @@ let GUIDHelper = {
 
   getItemGUID: function (aItemId) {
     if (this.GUIDsForIds.has(aItemId))
-      return Promise.resolve(this.GUIDsForIds.has(aItemId));
+      return Promise.resolve(this.GUIDsForIds.get(aItemId));
 
     let deferred = Promise.defer();
     let guid = "";
@@ -1732,12 +1732,12 @@ let GUIDHelper = {
           guid = row.getResultByIndex(1);
         }
       },
-      handleCompletion: function (aReason) {
+      handleCompletion: aReason => {
         if (aReason == REASON_FINISHED && guid) {
-          deferred.resolve(guid);
-
           this.ensureObservingRemovedItems();
           this.GUIDsForIds.set(aItemId, guid);
+
+          deferred.resolve(guid);
         }
         else if (!guid) {
           deferred.reject("no item found for the given itemId");