diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
index 8ef5c032..b65515af 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
@@ -50,7 +50,17 @@ public class Command_expel extends TFM_Command
                 if (!p.equals(sender_p))
                 {
                     Location target_pos = p.getLocation();
-                    if (target_pos.distance(sender_pos) < radius)
+                    
+                    boolean in_range = false;
+                    try
+                    {
+                        in_range = target_pos.distance(sender_pos) < radius;
+                    }
+                    catch (IllegalArgumentException ex)
+                    {
+                    }
+                    
+                    if (in_range)
                     {
                         sender.sendMessage("Pushing " + p.getName());
                         Vector expel_direction = target_pos.subtract(sender_pos).toVector().normalize();
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
index 00287b19..ad83fd3a 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
@@ -31,7 +31,13 @@ public class Command_radar extends TFM_Command
         {
             if (!p.equals(sender_p))
             {
-                radar_data.add(new TFM_RadarData(p, sender_pos.distance(p.getLocation()), p.getLocation()));
+                try
+                {
+                    radar_data.add(new TFM_RadarData(p, sender_pos.distance(p.getLocation()), p.getLocation()));
+                }
+                catch (IllegalArgumentException ex)
+                {
+                }
             }
         }
         
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java
index 2f61f078..102e3d7f 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Heartbeat.java
@@ -31,15 +31,21 @@ public class TFM_Heartbeat implements Runnable
 
         if (plugin.disableNight)
         {
-            for (World world : Bukkit.getWorlds())
+            try
             {
-                if (world.getTime() > 12000L)
+                for (World world : Bukkit.getWorlds())
                 {
-                    TFM_Util.setWorldTime(world, 1000L);
+                    if (world.getTime() > 12000L)
+                    {
+                        TFM_Util.setWorldTime(world, 1000L);
+                    }
                 }
             }
+            catch (NullPointerException ex)
+            {
+            }
         }
-        
+
         if (plugin.disableWeather)
         {
             for (World world : Bukkit.getWorlds())