diff --git a/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java b/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java
index c3099044..d4339b14 100755
--- a/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java
+++ b/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java
@@ -49,7 +49,7 @@ public class BufferedImageIcon implements Icon {
     private final boolean fast;
 
     public BufferedImageIcon(BufferedImage pImage) {
-        this(pImage, pImage.getWidth(), pImage.getHeight());
+        this(pImage, pImage != null ? pImage.getWidth() : 0, pImage != null ? pImage.getHeight() : 0);
     }
 
     public BufferedImageIcon(BufferedImage pImage, int pWidth, int pHeight) {