diff --git a/src/main/java/buttondevteam/chat/ChatPlayer.java b/src/main/java/buttondevteam/chat/ChatPlayer.java
index a23850e..8d6aa81 100644
--- a/src/main/java/buttondevteam/chat/ChatPlayer.java
+++ b/src/main/java/buttondevteam/chat/ChatPlayer.java
@@ -38,7 +38,10 @@ public class ChatPlayer extends TBMCPlayer {
 	}
 
 	public FlairStates getFlairState() {
-		return getEnumData(FlairStates.class);
+		FlairStates data = getEnumData(FlairStates.class);
+		if (data == null)
+			setFlairState(data = FlairStates.NoComment);
+		return data;
 	}
 
 	public void setFlairState(FlairStates state) {