diff --git a/src/games/stendhal/server/entity/player/UpdateConverter.java b/src/games/stendhal/server/entity/player/UpdateConverter.java
index 4f9438bfb9..58aefd5d30 100644
--- a/src/games/stendhal/server/entity/player/UpdateConverter.java
+++ b/src/games/stendhal/server/entity/player/UpdateConverter.java
@@ -279,8 +279,10 @@ public abstract class UpdateConverter {
     	}
 
 		//port to 0.86: port keymap to feature map, karama_indicator as feature
-		if (KeyedSlotUtil.getKeyedSlot(object, "!features", "keyring") != null) {
-			object.put("features", "keyring", "");
+		if (object.hasSlot("!features")) {
+			if (KeyedSlotUtil.getKeyedSlot(object, "!features", "keyring") != null) {
+				object.put("features", "keyring", "");
+			}
 		}
 		if (KeyedSlotUtil.getKeyedSlot(object, "!quests", "learn_karma") != null) {
 			object.put("features", "karma_indicator", "");