diff --git a/build.gradle b/build.gradle
index de188833f..0495effa2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'idea'
 }
 
-version = "1.9-beta5"
+version = "1.9-beta6"
 group= "kamkeel.customnpc-plus"
 archivesBaseName = "CustomNPC-Plus"
 
diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java
index 4724b1a11..8f516c887 100644
--- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java
+++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java
@@ -441,7 +441,8 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener, IT
     @Override
     public void save() {
         if (this.partyChanged) {
-            Client.sendData(EnumPacketServer.SavePartyData, ClientCacheHandler.party.writeClientNBT());
+            if(ClientCacheHandler.party != null)
+                Client.sendData(EnumPacketServer.SavePartyData, ClientCacheHandler.party.writeClientNBT());
         }
     }