From 31e7aa125339d7b9a45af580e5450b65f129569d Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Thu, 1 Jun 2017 02:59:46 -0400
Subject: [PATCH] Prevent AttributeError when self.obj is None.

---
 evennia/commands/command.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/commands/command.py b/evennia/commands/command.py
index 2684f9e8d..6a6025616 100644
--- a/evennia/commands/command.py
+++ b/evennia/commands/command.py
@@ -429,7 +429,7 @@ class Command(with_metaclass(CommandMeta, object)):
             object, conventionally with a preceding space.
 
         """
-        if hasattr(self, 'obj') and self.obj != caller:
+        if hasattr(self, 'obj') and self.obj and self.obj != caller:
             return " (%s)" % self.obj.get_display_name(caller).strip()
         return ""