From 3ac891fa5a2798ec26cf81628a0967bc9790858a Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sun, 27 Jan 2013 15:54:36 -0500
Subject: [PATCH] Try and handle "death on startup" a bit cleaner

---
 common/cpw/mods/fml/common/FMLCommonHandler.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/common/cpw/mods/fml/common/FMLCommonHandler.java
index 2fc57b7a58..eb13499af8 100644
--- a/common/cpw/mods/fml/common/FMLCommonHandler.java
+++ b/common/cpw/mods/fml/common/FMLCommonHandler.java
@@ -451,6 +451,10 @@ public class FMLCommonHandler
 
     public boolean shouldServerBeKilledQuietly()
     {
+        if (sidedDelegate == null)
+        {
+            return false;
+        }
         return sidedDelegate.shouldServerShouldBeKilledQuietly();
     }