diff --git a/lib/bukkit-0.0.1-SNAPSHOT.jar b/lib/bukkit-0.0.1-SNAPSHOT.jar
index 643dee0d..1551ebdd 100644
Binary files a/lib/bukkit-0.0.1-SNAPSHOT.jar and b/lib/bukkit-0.0.1-SNAPSHOT.jar differ
diff --git a/src/com/massivecraft/factions/cmd/CmdPeaceful.java b/src/com/massivecraft/factions/cmd/CmdPeaceful.java
index d4879356..6d37b357 100644
--- a/src/com/massivecraft/factions/cmd/CmdPeaceful.java
+++ b/src/com/massivecraft/factions/cmd/CmdPeaceful.java
@@ -49,11 +49,11 @@ public class CmdPeaceful extends FCommand
 		{
 			if (fplayer.getFaction() == faction)
 			{
-				fplayer.msg(fme.getNameAndRelevant(fplayer)+"<i> has "+change+" your faction.");
+				fplayer.msg((fme == null ? "A server admin" : fme.getNameAndRelevant(fplayer))+"<i> has "+change+" your faction.");
 			}
 			else
 			{
-				fplayer.msg(fme.getNameAndRelevant(fplayer)+"<i> has "+change+" the faction \"" + faction.getTag(fplayer) + "\".");
+				fplayer.msg((fme == null ? "A server admin" : fme.getNameAndRelevant(fplayer))+"<i> has "+change+" the faction \"" + faction.getTag(fplayer) + "\".");
 			}
 		}
 
diff --git a/src/com/massivecraft/factions/cmd/CmdPermanent.java b/src/com/massivecraft/factions/cmd/CmdPermanent.java
index d9883740..f705785b 100644
--- a/src/com/massivecraft/factions/cmd/CmdPermanent.java
+++ b/src/com/massivecraft/factions/cmd/CmdPermanent.java
@@ -48,11 +48,11 @@ public class CmdPermanent extends FCommand
 		{
 			if (fplayer.getFaction() == faction)
 			{
-				fplayer.msg(fme.getNameAndRelevant(fplayer)+"<i> has "+change+" your faction.");
+				fplayer.msg((fme == null ? "A server admin" : fme.getNameAndRelevant(fplayer))+"<i> has "+change+" your faction.");
 			}
 			else
 			{
-				fplayer.msg(fme.getNameAndRelevant(fplayer)+"<i> has "+change+" the faction \"" + faction.getTag(fplayer) + "\".");
+				fplayer.msg((fme == null ? "A server admin" : fme.getNameAndRelevant(fplayer))+"<i> has "+change+" the faction \"" + faction.getTag(fplayer) + "\".");
 			}
 		}
 	}
diff --git a/src/com/massivecraft/factions/integration/SpoutMainListener.java b/src/com/massivecraft/factions/integration/SpoutMainListener.java
index 07213817..526dd869 100644
--- a/src/com/massivecraft/factions/integration/SpoutMainListener.java
+++ b/src/com/massivecraft/factions/integration/SpoutMainListener.java
@@ -3,6 +3,8 @@ package com.massivecraft.factions.integration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.bukkit.entity.Player;
+
 import com.massivecraft.factions.Board;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FLocation;
@@ -44,7 +46,11 @@ public class SpoutMainListener extends SpoutListener
 
 	public boolean updateTerritoryDisplay(FPlayer player)
 	{
-		SpoutPlayer sPlayer = SpoutManager.getPlayer(player.getPlayer());
+		Player p = player.getPlayer();
+		if (p == null)
+			return false;
+
+		SpoutPlayer sPlayer = SpoutManager.getPlayer(p);
 		if (!sPlayer.isSpoutCraftEnabled() || (Conf.spoutTerritoryDisplaySize <= 0 && ! Conf.spoutTerritoryNoticeShow))
 			return false;
 
diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
index 5c072aa5..03e09526 100644
--- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -324,7 +324,7 @@ public class FactionsEntityListener extends EntityListener
 		// You can not hurt neutral factions
 		if (Conf.disablePVPBetweenNeutralFactions && relation.isNeutral())
 		{
-			attacker.sendMessage("You can't hurt neutral factions");
+			attacker.sendMessage("You can't hurt neutral factions. Declare them as an enemy.");
 			return false;
 		}
 		
@@ -346,7 +346,7 @@ public class FactionsEntityListener extends EntityListener
 		// You can not hurt neutrals in their own territory.
 		if (ownTerritory && relation.isNeutral())
 		{
-			attacker.sendMessage(p.txt.parse("<i>You can't hurt "+relation.getColor()+defender.getNameAndRelevant(attacker)+"<i> in their own territory."));
+			attacker.sendMessage(p.txt.parse("<i>You can't hurt "+relation.getColor()+defender.getNameAndRelevant(attacker)+"<i> in their own territory unless you declare them as an enemy."));
 			defender.sendMessage(p.txt.parse(attacker.getNameAndRelevant(defender)+"<i> tried to hurt you."));
 			return false;
 		}