diff --git a/core/AppEng.java b/core/AppEng.java
index 21202977..35ab2d0d 100644
--- a/core/AppEng.java
+++ b/core/AppEng.java
@@ -24,6 +24,7 @@ import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -181,9 +182,14 @@ public class AppEng
 	}
 
 	@EventHandler
-	public void serverStarting(FMLServerStartingEvent evt)
+	public void serverStarting(FMLServerAboutToStartEvent evt)
 	{
 		WorldSettings.getInstance().init();
+	}
+
+	@EventHandler
+	public void serverStarting(FMLServerStartingEvent evt)
+	{
 		evt.registerServerCommand( new AECommand( evt.getServer() ) );
 	}
 
diff --git a/hooks/MeteoriteWorldGen.java b/hooks/MeteoriteWorldGen.java
index 9282e64a..978d26eb 100644
--- a/hooks/MeteoriteWorldGen.java
+++ b/hooks/MeteoriteWorldGen.java
@@ -1,7 +1,6 @@
 package appeng.hooks;
 
 import java.util.Random;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import net.minecraft.world.World;
@@ -46,7 +45,6 @@ final public class MeteoriteWorldGen implements IWorldGenerator
 
 			try
 			{
-
 				future.get();
 
 				if ( obj.distance > AEConfig.instance.minMeteoriteDistanceSq )
@@ -67,11 +65,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator
 				}
 
 			}
-			catch (InterruptedException e)
-			{
-				AELog.error( e );
-			}
-			catch (ExecutionException e)
+			catch (Throwable e)
 			{
 				AELog.error( e );
 			}