diff --git a/src/com/massivecraft/massivecore/mixin/DisplayNameMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/DisplayNameMixinAbstract.java
index 2e694f26..3cb702d3 100644
--- a/src/com/massivecraft/massivecore/mixin/DisplayNameMixinAbstract.java
+++ b/src/com/massivecraft/massivecore/mixin/DisplayNameMixinAbstract.java
@@ -6,6 +6,8 @@ public abstract class DisplayNameMixinAbstract implements DisplayNameMixin
 {
 	public Mson getDisplayNameMson(Object senderObject, Object watcherObject)
 	{
-		return Mson.fromParsedMessage(this.getDisplayName(senderObject, watcherObject));
+		String displayName = this.getDisplayName(senderObject, watcherObject);
+		if (displayName == null) return null;
+		return Mson.fromParsedMessage(displayName);
 	}
 }