diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/Hats.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/Hats.java
index 0d2b7cf..ced3e77 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/Hats.java
+++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/Hats.java
@@ -24,10 +24,7 @@ public class Hats {
 
     public static void setHat(UUID uuid, String hatName) {
         SaturnPlayer player = SaturnPlayer.get(uuid);
-        if (player == null) {
-            // Auth.players.put(uuid, new SaturnPlayer("", hatName));
-            // TODO: address this behaviour
-        } else {
+        if (player != null) {
             player.hat = hatName;
         }
     }
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
index 32e3283..d624942 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
+++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
@@ -76,10 +76,7 @@ public class Cloaks {
     public static void setCloak(UUID uuid, String cloakName) {
         SaturnPlayer player = SaturnPlayer.get(uuid);
 
-        if (player == null) {
-            // Auth.players.put(uuid, new SaturnPlayer(cloakName, null));
-            // TODO: Address this functionality
-        } else {
+        if (player != null) {
             player.cloak = cloakName;
         }