diff --git a/fonts.js b/fonts.js
index 6fb99a4d2..59a654aeb 100755
--- a/fonts.js
+++ b/fonts.js
@@ -192,7 +192,6 @@ var FontLoader = {
     for (var i = 0; i < this.waitingFontObjs.length; i++) {
       var fontObj = this.waitingFontObjs[i];
       var rule = this.bindDOM(fontObj);
-      this.fonts[objIds[i]] = fontObj;
       names.push(fontObj.loadedName);
       rules.push(rule);
     }
@@ -205,8 +204,7 @@ var FontLoader = {
   fontLoadEvent: function(objIds) {
     for (var i = 0; i < objIds.length; i++) {
       var objId = objIds[i];
-      Objects.resolve(objId, this.fonts[objId]);
-      delete this.fonts[objId];
+      Objects.resolve(objId);
     }
     
     this.fontsLoading = false;
diff --git a/pdf.js b/pdf.js
index e7c3d6efa..6068785ba 100644
--- a/pdf.js
+++ b/pdf.js
@@ -4884,12 +4884,8 @@ var CanvasGraphics = (function() {
             var deps = argsArray[i];
             for (var n = 0; n < deps.length; n++) {
               var depObjId = deps[n];
-              var promise;
-              if (!Objects[depObjId]) {
-                promise = Objects[depObjId] = new Promise(depObjId);
-              } else {
-                promise = Objects[depObjId];
-              }
+              var promise = Objects.getPromise(depObjId);
+
               // If the promise isn't resolved yet, add the continueCallback
               // to the promise and bail out.
               if (!promise.isResolved) {
diff --git a/worker.js b/worker.js
index 9c6bf40df..a1bbf85a6 100644
--- a/worker.js
+++ b/worker.js
@@ -60,6 +60,19 @@ var WorkerPage = (function() {
 
 // This holds a list of objects the IR queue depends on.
 var Objects = {
+  getPromise: function(objId) {
+	  if (Objects[objId]) {
+	    return this[objId];
+	  } else {
+	    return this[objId] = new Promise(objId);
+	  }
+  },
+  
+  setData: function(objId, data) {
+    var promise = this.getPromise(objId);
+    promise.data = data;
+  },
+	
   resolve: function(objId, data) {
     // In case there is a promise already on this object, just resolve it.
     if (Objects[objId]) {
@@ -79,19 +92,39 @@ var Objects = {
 };
 
 var Promise = (function() {
+  var EMPTY_PROMISE = {};
+
   function Promise(name, data) {
     this.name = name;
     // If you build a promise and pass in some data it's already resolved.
     if (data != null) {
       this.isResolved = true;
-      this.data = data;
+      this.$data = data;
     } else {
       this.isResolved = false;      
+      this.$data = EMPTY_PROMISE;
     }
     this.callbacks = [];
   };
   
   Promise.prototype = {
+    set data(data) {
+      if (data === undefined) {
+        return;
+      }
+      if (this.$data !== EMPTY_PROMISE) {
+        throw "Promise " + this.name + ": Cannot set the data of a promise twice";
+      }
+      this.$data = data;
+    },
+    
+    get data() {
+      if (this.$data === EMPTY_PROMISE) {
+        throw "Promise " + this.name + ": Cannot get data that isn't set";
+      }
+      return this.$data;
+    },
+    
     resolve: function(data) {
       if (this.isResolved) {
         throw "A Promise can be resolved only once";
@@ -109,7 +142,8 @@ var Promise = (function() {
     then: function(callback) {
       // If the promise is already resolved, call the callback directly.
       if (this.isResolved) {
-        callback.call(null, this.data);
+        var data = this.data;
+        callback.call(null, data);
       } else {
         this.callbacks.push(callback);        
       }
@@ -128,7 +162,7 @@ var WorkerPDFDoc = (function() {
     
     this.pageCache = [];
     
-    var useWorker = true;
+    var useWorker = false;
     
     if (useWorker) {
       var worker = new Worker("../worker/boot_processor.js");
@@ -181,6 +215,7 @@ var WorkerPDFDoc = (function() {
       if (!fontObj.str) {
         Objects.resolve(objId, fontObj);
       } else {
+        Objects.setData(objId, fontObj);
         FontLoader.bind(objId, fontObj);
       }
     });