--- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PresentingPainter.java	2014-09-09 15:48:29.000000000 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/PresentingPainter.java	2014-09-09 15:48:29.000000000 -0700
@@ -122,7 +122,9 @@
             ViewScene viewScene = (ViewScene)sceneState.getScene();
             viewScene.setPainting(false);
 
-            factory.getTextureResourcePool().freeDisposalRequestedAndCheckResources(errored);
+            if (factory != null) {
+                factory.getTextureResourcePool().freeDisposalRequestedAndCheckResources(errored);
+            }
 
             renderLock.unlock();
         }
--- old/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	2014-09-09 15:48:30.000000000 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/UploadingPainter.java	2014-09-09 15:48:30.000000000 -0700
@@ -183,7 +183,9 @@
 
             sceneState.getScene().setPainting(false);
 
-            factory.getTextureResourcePool().freeDisposalRequestedAndCheckResources(errored);
+            if (factory != null) {
+                factory.getTextureResourcePool().freeDisposalRequestedAndCheckResources(errored);
+            }
 
             renderLock.unlock();
         }