diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 4dedca86d..e693716fe 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -22,6 +22,9 @@ public class EntitySpawnListener implements Listener {
             return;
         }
         Plot plot = area.getOwnedPlotAbs(location);
+        if (plot == null) {
+            return;
+        }
         if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
             event.setCancelled(true);
         }
diff --git a/pom.xml b/pom.xml
index f85ae30a5..ea5039fe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
       <url>http://maven.sk89q.com/artifactory/repo/</url>
     </repository>
     <repository>
-      <id>vault-repo</id>
-      <url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
+      <id>vault</id>
+      <url>http://nexus.hc.to/content/repositories/pub_releases/</url>
     </repository>
     <repository>
       <id>empcraft-repo</id>
@@ -80,9 +80,9 @@
   </repositories>
   <dependencies>
     <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>Spigot</artifactId>
-      <version>1.10</version>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.10.2-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.sk89q</groupId>