diff --git a/src/main/java/org/saturnclient/cosmetics/Cloaks.java b/src/main/java/org/saturnclient/cosmetics/Cloaks.java
index df17902..8e50a7b 100644
--- a/src/main/java/org/saturnclient/cosmetics/Cloaks.java
+++ b/src/main/java/org/saturnclient/cosmetics/Cloaks.java
@@ -38,7 +38,14 @@ public class Cloaks {
         availableCloaks.add(0, "");
     }
 
+    /**
+     * The cloak's texture, or null for no cloak ("", the "None" choice) and for a cloak this version
+     * has no texture for, which would otherwise draw as the missing texture.
+     */
     public static IdentifierRef getCurrentCloakTexture(String cloakName) {
+        if (cloakName == null || !Arrays.asList(ALL_CLOAKS).contains(cloakName)) {
+            return null;
+        }
         if (Arrays.asList(ANIMATED_CLOAKS).contains(cloakName)) {
             return IdentifierRef.ofSaturn("textures/cloaks/" + cloakName + ".gif");
         } else {