diff --git a/client/ClientHelper.java b/client/ClientHelper.java
index 2c3b55543..85b3db347 100644
--- a/client/ClientHelper.java
+++ b/client/ClientHelper.java
@@ -90,6 +90,9 @@ public class ClientHelper extends ServerHelper
 	public void triggerUpdates()
 	{
 		Minecraft mc = Minecraft.getMinecraft();
+		if ( mc == null || mc.thePlayer == null || mc.theWorld == null )
+			return;
+
 		EntityPlayer player = mc.thePlayer;
 
 		if ( player == null )