diff --git a/plugin.yml b/plugin.yml
index 7f09dba..86d9b26 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -2,7 +2,7 @@ name: GriefPrevention
 main: me.ryanhamshire.GriefPrevention.GriefPrevention
 softdepend: [Vault, Multiverse-Core, My Worlds, MystCraft, Transporter]
 dev-url: http://dev.bukkit.org/server-mods/grief-prevention
-version: 8.2.3
+version: 8.3
 commands:
    abandonclaim:
       description: Deletes a claim.
diff --git a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
index 1e36cce..a25e14c 100644
--- a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
@@ -331,7 +331,7 @@ public class BlockEventHandler implements Listener
 		{
 			if(!playerData.warnedAboutBuildingOutsideClaims
 			   && ((playerData.lastClaim == null && playerData.claims.size() == 0)
-			   || playerData.lastClaim.isNear(player.getLocation(), 15)))
+			   || (playerData.lastClaim != null && playerData.lastClaim.isNear(player.getLocation(), 15))))
 			{
 				GriefPrevention.sendMessage(player, TextMode.Warn, Messages.BuildingOutsideClaims);
 				playerData.warnedAboutBuildingOutsideClaims = true;