diff --git a/fonts.js b/fonts.js
index 735213f5b..47aeabc3f 100644
--- a/fonts.js
+++ b/fonts.js
@@ -1807,8 +1807,8 @@ CFF.prototype = {
         var data =
             "\x8b\x14" + // defaultWidth
             "\x8b\x15" + // nominalWidth
-            self.encodeNumber(properties.stdHW) + "\x0a" + // StdHW
-            self.encodeNumber(properties.stdVW) + "\x0b";  // StdVW
+            self.encodeNumber(properties.stdHW || 0) + "\x0a" + // StdHW
+            self.encodeNumber(properties.stdVW || 0) + "\x0b";  // StdVW
 
         var stemH = properties.stemSnapH;
         for (var i = 0; i < stemH.length; i++)
diff --git a/pdf.js b/pdf.js
index 48fa004e6..5644bf036 100644
--- a/pdf.js
+++ b/pdf.js
@@ -3875,7 +3875,7 @@ var CanvasGraphics = (function() {
                 this.ctx.translate(this.current.x, -1 * this.current.y);
 
                 var font = Fonts.lookup(this.current.fontName);
-                if (font)
+                if (font && font.properties.textMatrix)
                   this.ctx.transform.apply(this.ctx, font.properties.textMatrix);
 
                 this.ctx.fillText(text, 0, 0);
diff --git a/test/driver.js b/test/driver.js
index baa7358fd..b4c2c64e0 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -152,7 +152,7 @@ function snapshotCurrentPage(gfx, page, task, failure) {
     }
 
     sendTaskResult(canvas.toDataURL("image/png"), task, failure);
-    log("done"+ (failure ? " (failed!)" : "") +"\n");
+    log("done"+ (failure ? " (failed!: "+ failure +")" : "") +"\n");
     
     // Set up the next request
     backoff = (inFlightRequests > 0) ? inFlightRequests * 10 : 0;