--- a/dom/camera/GonkNativeWindow.cpp
+++ b/dom/camera/GonkNativeWindow.cpp
@@ -258,21 +258,25 @@ int GonkNativeWindow::dequeueBuffer(andr
     if (gbuf == NULL) {
         status_t error;
         SurfaceDescriptor buffer;
         ImageBridgeChild *ibc = ImageBridgeChild::GetSingleton();
         ibc->AllocSurfaceDescriptorGralloc(gfxIntSize(mDefaultWidth, mDefaultHeight),
                                            mPixelFormat,
                                            mUsage,
                                            &buffer);
+        // We can only use a gralloc buffer here.  If we didn't get
+        // one back, something went wrong.
+        if (SurfaceDescriptor::TSurfaceDescriptorGralloc != buffer.type()) {
+            MOZ_ASSERT(SurfaceDescriptor::T__None == buffer.type());
+            CNW_LOGE("dequeueBuffer: failed to alloc gralloc buffer");
+            return -ENOMEM;
+        }
         sp<GraphicBuffer> graphicBuffer =
           GrallocBufferActor::GetFrom(buffer.get_SurfaceDescriptorGralloc());
-        if (!graphicBuffer.get()) {
-            return -ENOMEM;
-        }
         error = graphicBuffer->initCheck();
         if (error != NO_ERROR) {
             CNW_LOGE("dequeueBuffer: createGraphicBuffer failed with error %d",error);
             return error;
         }
         mSlots[buf].mGraphicBuffer = graphicBuffer;
         mSlots[buf].mSurfaceDescriptor = buffer;
         mSlots[buf].mSurfaceDescriptor.get_SurfaceDescriptorGralloc().external() = true;