diff --git a/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java b/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java
index b76e91a..53c4c0c 100644
--- a/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java
+++ b/war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java
@@ -287,7 +287,7 @@ public class WarPlayerListener extends PlayerListener {
 					}
 				}
 								
-				if (zone.getLobby().isInWarHubLinkGate(playerLoc)){
+				if (war.getWarHub() != null && zone.getLobby().isInWarHubLinkGate(playerLoc)){
 					enteredGate = true;
 					dropFromOldTeamIfAny(player);
 					event.setFrom(war.getWarHub().getLocation());
diff --git a/war/src/main/java/plugin.yml b/war/src/main/java/plugin.yml
index 6219390..c38e6cd 100644
--- a/war/src/main/java/plugin.yml
+++ b/war/src/main/java/plugin.yml
@@ -1,5 +1,5 @@
 name: War
-version: 1.2 (Bradley)
+version: 1.2.1 (Bradley)
 description: Lets you create TDM and CTF (warzones) for a more structured PVP experience.
 author: tommytony
 website: war.tommytony.com
diff --git a/war/target/classes/plugin.yml b/war/target/classes/plugin.yml
index 6219390..c38e6cd 100644
--- a/war/target/classes/plugin.yml
+++ b/war/target/classes/plugin.yml
@@ -1,5 +1,5 @@
 name: War
-version: 1.2 (Bradley)
+version: 1.2.1 (Bradley)
 description: Lets you create TDM and CTF (warzones) for a more structured PVP experience.
 author: tommytony
 website: war.tommytony.com