diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
index b9512c5..df33395 100644
--- a/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
+++ b/src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
@@ -125,12 +125,15 @@ public class PlayerManager extends Manager {
       Bukkit.getServer()
           .broadcast(
               textComp(
-                  "<gray>[</gray><green>+</green><gray>]</gray><white>" + e.getPlayer().getName()));
+                  "<gray>[</gray><green>+</green><gray>]</gray> <white>"
+                      + e.getPlayer().getName()));
     }
     addPlayer(srPlayer);
 
-    e.getPlayer().getInventory().clear();
-    e.getPlayer().getInventory().setContents(srPlayer.getInventory().getContents());
+    if (srPlayer.getInventory() != null) {
+      e.getPlayer().getInventory().clear();
+      e.getPlayer().getInventory().setContents(srPlayer.getInventory().getContents());
+    }
 
     // TODO: does not update when player health has changed for example
     BukkitTask task =
@@ -161,6 +164,7 @@ public class PlayerManager extends Manager {
             .create();
     String json = dh.get(PLAYER_KEY + p);
     SRPlayer srPlayer = gson.fromJson(json, SRPlayer.class);
+
     if (srPlayer == null) {
       srPlayer = new SRPlayer(p);
     } else {
@@ -184,7 +188,8 @@ public class PlayerManager extends Manager {
     }
 
     removePlayer(e.getPlayer().getUniqueId());
-    Bukkit.getServer().broadcast(textComp("<gray>[<red>-<gray>] " + e.getPlayer().getName()));
+    Bukkit.getServer()
+        .broadcast(textComp("<gray>[<red>-<gray>] <white>" + e.getPlayer().getName()));
   }
 
   @EventHandler
diff --git a/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java b/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java
index ff225d0..cf761f7 100644
--- a/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java
+++ b/src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java
@@ -37,7 +37,7 @@ public class SRPlayer {
   @Expose private Map<Attribute, Double> attributes = new EnumMap<>(Attribute.class);
   private Map<Attribute, Map<ItemStack, Double>> itemAttributes = new EnumMap<>(Attribute.class);
   @Expose private List<PotionEffect> potionEffects = new ArrayList<>();
-  @Expose private Inventory inventory = null;
+  @Expose private Inventory inventory;
   @Expose private List<Integer> treasuresOpened = new ArrayList<>();
   private boolean isClientBuilder = false;
   private boolean firstTime = true;