diff --git a/src/me/ryanhamshire/GriefPrevention/DataStore.java b/src/me/ryanhamshire/GriefPrevention/DataStore.java
index 15f201b..9571561 100644
--- a/src/me/ryanhamshire/GriefPrevention/DataStore.java
+++ b/src/me/ryanhamshire/GriefPrevention/DataStore.java
@@ -918,7 +918,7 @@ public abstract class DataStore
 		for(int i = 0; i < this.claims.size(); i++)
 		{
 			Claim claim = this.claims.get(i);
-			if((playerID == claim.ownerID || playerID.equals(claim.ownerID)) && (deleteCreativeClaims || !GriefPrevention.instance.creativeRulesApply(claim.getLesserBoundaryCorner())))
+			if((playerID == claim.ownerID || (playerID != null && playerID.equals(claim.ownerID))) && (deleteCreativeClaims || !GriefPrevention.instance.creativeRulesApply(claim.getLesserBoundaryCorner())))
 				claimsToDelete.add(claim);
 		}
 		
diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
index 6d2046a..699aac5 100644
--- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
+++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
@@ -1683,7 +1683,7 @@ public class GriefPrevention extends JavaPlugin
 		}
 		
 		//deletealladminclaims
-		else if(cmd.getName().equalsIgnoreCase("deletealladminclaims"))
+		else if(player != null && cmd.getName().equalsIgnoreCase("deletealladminclaims"))
 		{
 			if(!player.hasPermission("griefprevention.deleteclaims"))
 			{