diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index 42b2093647e..4a6fe1a15a7 100644
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -1455,6 +1455,7 @@ CanvasRenderingContext2D::CreatePattern(const HTMLImageOrCanvasOrVideoElement& e
 
   // Ignore nullptr cairo surfaces! See bug 666312.
   if (!res.mSurface->CairoSurface() || res.mSurface->CairoStatus()) {
+    error.Throw(NS_ERROR_NOT_AVAILABLE);
     return nullptr;
   }
 
diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in
index 4a97a534bc4..1f639ea8e5f 100644
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -106,6 +106,7 @@ MOCHITEST_FILES = \
 	test_bug753758.html \
 	test_bug764125.html \
 	test_bug856472.html \
+	test_bug866575.html \
 	test_drawImage_edge_cases.html \
 	test_drawImage_document_domain.html \
   test_mozDashOffset.html \
diff --git a/content/canvas/test/test_bug866575.html b/content/canvas/test/test_bug866575.html
new file mode 100644
index 00000000000..cdb2dc9c61a
--- /dev/null
+++ b/content/canvas/test/test_bug866575.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=866575
+-->
+<head>
+  <title>Test for Bug 866575</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=866575">Mozilla Bug 866575</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script>
+/** Test for Bug 866575 **/
+
+var canvas1 = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
+canvas1.width = "306368";
+var canvas2 = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
+try {
+  canvas2.getContext('2d').createPattern(canvas1, 'repeat-x');
+} catch (e) {}
+finally {
+  ok(true, "Didn't crash");
+}
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index f3e9cb63cb9..c9357047e52 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -4654,6 +4654,9 @@ nsLayoutUtils::SurfaceFromElement(HTMLCanvasElement* aElement,
       surf = gfxPlatform::GetPlatform()->CreateOffscreenSurface(size, gfxASurface::CONTENT_COLOR_ALPHA);
     }
 
+    if (!surf)
+      return result;
+
     nsRefPtr<gfxContext> ctx = new gfxContext(surf);
     // XXX shouldn't use the external interface, but maybe we can layerify this
     uint32_t flags = premultAlpha ? HTMLCanvasElement::RenderFlagPremultAlpha : 0;
