From ac6b9206d385530171dc0fd82a5567d34ab414de Mon Sep 17 00:00:00 2001
From: Doublestrike <doublestrike@cardforge.org>
Date: Mon, 13 Feb 2012 12:35:18 +0000
Subject: [PATCH] Improved error handling in FSkin.

---
 src/main/java/forge/view/toolbox/FSkin.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java
index 9fbddd883f7..681e0626c96 100644
--- a/src/main/java/forge/view/toolbox/FSkin.java
+++ b/src/main/java/forge/view/toolbox/FSkin.java
@@ -558,6 +558,9 @@ public enum FSkin {
      * @return {@link java.awt.Image}
      */
     public static Image getImage(final SkinProp s0) {
+        if (FSkin.images.get(s0) == null) {
+            throw new NullPointerException("Can't find an image for SkinProp " + s0);
+         }
         return FSkin.images.get(s0);
     }
 
@@ -568,6 +571,9 @@ public enum FSkin {
      * @return {@link javax.swing.ImageIcon}
      */
     public static ImageIcon getIcon(final SkinProp s0) {
+        if (FSkin.icons.get(s0) == null) {
+           throw new NullPointerException("Can't find an icon for SkinProp " + s0);
+        }
         return FSkin.icons.get(s0);
     }