diff --git a/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java b/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java
index 4c5be3aea..243d6b4a2 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java
@@ -1,59 +1,77 @@
-/*******************************************************************************************************
- * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
- * 
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *******************************************************************************************************/
-
-package me.blackvein.quests.listeners;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPostCreateEvent;
-import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPostDeleteEvent;
-import com.alessiodp.parties.api.events.bukkit.player.BukkitPartiesPlayerPostJoinEvent;
-import com.alessiodp.parties.api.events.bukkit.player.BukkitPartiesPlayerPostLeaveEvent;
-
-import me.blackvein.quests.util.Lang;
-
-public class PartiesListener implements Listener {
-    
-    @EventHandler
-    public void onPartyCreate(BukkitPartiesPartyPostCreateEvent event) {
-        Bukkit.getServer().getPlayer(event.getCreator().getPlayerUUID()).sendMessage(ChatColor.YELLOW + Lang.get("questPartiesCreate"));
-    }
-    
-    @EventHandler
-    public void onPartyDeleteEvent(BukkitPartiesPartyPostDeleteEvent event) {
-        Bukkit.getServer().getPlayer(event.getCommandSender().getPlayerUUID()).sendMessage(ChatColor.RED + Lang.get("questPartiesDelete"));
-    }
-    
-    @EventHandler
-    public void onPlayerJoinEvent(BukkitPartiesPlayerPostJoinEvent event) {
-        if (event.isInvited()) {
-            Player i = Bukkit.getServer().getPlayer(event.getInviter());
-            i.sendMessage(ChatColor.GREEN + Lang.get(i, "questPartiesInvite").replace("<player>", i.getName()));
-        }
-        Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
-        p.sendMessage(ChatColor.GREEN + Lang.get(p, "questPartiesJoin").replace("<player>", p.getName()));
-    }
-    
-    @EventHandler
-    public void onPlayerLeaveEvent(BukkitPartiesPlayerPostLeaveEvent event) {
-        if (event.isKicked()) {
-            Player k = Bukkit.getServer().getPlayer(event.getKicker().getPlayerUUID());
-            k.sendMessage(ChatColor.RED + Lang.get(k, "questPartiesKicked").replace("<player>", k.getName()));
-        }
-        Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
-        p.sendMessage(ChatColor.RED + Lang.get(p, "questPartiesLeave").replace("<player>", p.getName()));
-    }
-}
+/*******************************************************************************************************
+ * Continued by PikaMug (formerly HappyPikachu) with permission from _Blackvein_. All rights reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************************************/
+
+package me.blackvein.quests.listeners;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPostCreateEvent;
+import com.alessiodp.parties.api.events.bukkit.party.BukkitPartiesPartyPostDeleteEvent;
+import com.alessiodp.parties.api.events.bukkit.player.BukkitPartiesPlayerPostJoinEvent;
+import com.alessiodp.parties.api.events.bukkit.player.BukkitPartiesPlayerPostLeaveEvent;
+
+import me.blackvein.quests.util.Lang;
+
+public class PartiesListener implements Listener {
+    
+    @EventHandler
+    public void onPartyCreate(BukkitPartiesPartyPostCreateEvent event) {
+        if (event.getCreator() != null) {
+            Player p = Bukkit.getServer().getPlayer(event.getCreator().getPlayerUUID());
+            if (p != null) {
+                p.sendMessage(ChatColor.YELLOW + Lang.get("questPartiesCreate"));
+            }
+        }
+    }
+    
+    @EventHandler
+    public void onPartyDeleteEvent(BukkitPartiesPartyPostDeleteEvent event) {
+        if (event.getCommandSender() != null) {
+            Player p = Bukkit.getServer().getPlayer(event.getCommandSender().getPlayerUUID());
+            if (p != null) {
+                p.sendMessage(ChatColor.RED + Lang.get("questPartiesDelete"));
+            }
+        }
+    }
+    
+    @EventHandler
+    public void onPlayerJoinEvent(BukkitPartiesPlayerPostJoinEvent event) {
+        if (event.isInvited() && event.getInviter() != null) {
+            Player i = Bukkit.getServer().getPlayer(event.getInviter());
+            if (i != null) {
+                i.sendMessage(ChatColor.GREEN + Lang.get(i, "questPartiesInvite").replace("<player>", i.getName()));
+            }
+        }
+        Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
+        if (p != null) {
+            p.sendMessage(ChatColor.GREEN + Lang.get(p, "questPartiesJoin").replace("<player>", p.getName()));
+        }
+    }
+    
+    @EventHandler
+    public void onPlayerLeaveEvent(BukkitPartiesPlayerPostLeaveEvent event) {
+        if (event.isKicked()) {
+            Player k = Bukkit.getServer().getPlayer(event.getKicker().getPlayerUUID());
+            if (k != null) {
+                k.sendMessage(ChatColor.RED + Lang.get(k, "questPartiesKicked").replace("<player>", k.getName()));
+            }
+        }
+        Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID());
+        if (p != null) {
+            p.sendMessage(ChatColor.RED + Lang.get(p, "questPartiesLeave").replace("<player>", p.getName()));
+        }
+    }
+}