diff --git a/client/texture/FlipableIcon.java b/client/texture/FlipableIcon.java
index bc2331988..e30cc8fec 100644
--- a/client/texture/FlipableIcon.java
+++ b/client/texture/FlipableIcon.java
@@ -10,6 +10,10 @@ public class FlipableIcon implements IIcon
 	boolean flip_v;
 
 	public FlipableIcon(IIcon o) {
+		
+		if ( o == null )
+			throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
+		
 		original = o;
 		flip_u = false;
 		flip_v = false;
diff --git a/client/texture/FullIcon.java b/client/texture/FullIcon.java
index 59f0d1ca4..397adc85e 100644
--- a/client/texture/FullIcon.java
+++ b/client/texture/FullIcon.java
@@ -10,6 +10,10 @@ public class FullIcon implements IIcon
 	private IIcon p;
 
 	public FullIcon(IIcon o) {
+		
+		if ( o == null )
+			throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
+		
 		p = o;
 	}
 
diff --git a/client/texture/OffsetIcon.java b/client/texture/OffsetIcon.java
index f8c676a06..ddd17d44c 100644
--- a/client/texture/OffsetIcon.java
+++ b/client/texture/OffsetIcon.java
@@ -13,6 +13,10 @@ public class OffsetIcon implements IIcon
 	private IIcon p;
 
 	public OffsetIcon(IIcon o, float x, float y) {
+		
+		if ( o == null )
+			throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
+		
 		p = o;
 		offsetX = x;
 		offsetY = y;
diff --git a/client/texture/TaughtIcon.java b/client/texture/TaughtIcon.java
index 1c21acfbf..64ee1c588 100644
--- a/client/texture/TaughtIcon.java
+++ b/client/texture/TaughtIcon.java
@@ -12,6 +12,10 @@ public class TaughtIcon implements IIcon
 	private IIcon p;
 
 	public TaughtIcon(IIcon o, float tightness) {
+		
+		if ( o == null )
+			throw new RuntimeException("Cannot create a wrapper icon with a null icon.");
+		
 		p = o;
 		this.tightness = tightness * 0.4f;
 	}