diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 823ce8f..aa6fe72 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -711,6 +711,10 @@
 
     SkDevice* device = this->createLayerDevice(config, ir.width(), ir.height(),
                                                isOpaque);
+    if (NULL == device) {
+        SkDebugf("Unable to create device for layer.");
+        return count;
+    }
 
     device->setOrigin(ir.fLeft, ir.fTop);
     DeviceCM* layer = SkNEW_ARGS(DeviceCM, (device, ir.fLeft, ir.fTop, paint));
diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
index 79164e6..8c9e180 100644
--- a/src/utils/win/SkIStream.cpp
+++ b/src/utils/win/SkIStream.cpp
@@ -189,8 +189,8 @@
         break;
     }
     
-    if (NULL != lpNewFilePointer) {
-        lpNewFilePointer->QuadPart = this->fLocation.QuadPart;
+    if (NULL != lpNewFilePointer) {
+        lpNewFilePointer->QuadPart = this->fLocation.QuadPart;
     }
     return hr;
 }