diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/src/main/java/com/gmail/nossr50/party/PartyManager.java
index 21abbeaa6..614306d67 100644
--- a/src/main/java/com/gmail/nossr50/party/PartyManager.java
+++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java
@@ -41,8 +41,18 @@ public class PartyManager {
      * @return true if they are in the same party, false otherwise
      */
     public boolean inSameParty(Player firstPlayer, Player secondPlayer) {
-        if (Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null 
-                || !Users.getProfile(firstPlayer).getParty().equals(Users.getProfile(secondPlayer).getParty())) {
+        if (Users.getProfile(firstPlayer) == null) {
+            plugin.getLogger().info("The defending player's profile was null.");
+            plugin.getLogger().info("This player is online: " + firstPlayer.isOnline());
+            return false;
+        }
+
+        if (Users.getProfile(secondPlayer) == null) {
+            plugin.getLogger().info("The attacking player's profile was null.");
+            plugin.getLogger().info("This player is online: " + secondPlayer.isOnline());
+            return false;
+        }
+        if (Users.getProfile(firstPlayer).getParty() == null || Users.getProfile(secondPlayer).getParty() == null || !Users.getProfile(firstPlayer).getParty().equals(Users.getProfile(secondPlayer).getParty())) {
             return false;
         }