diff --git a/LCS/Messaging/python/messaging/messages.py b/LCS/Messaging/python/messaging/messages.py
index 848dbe4543272debe2e2605683da38677c6e991d..af53ce9d808fb43bc0a4878984836eb43b241345 100644
--- a/LCS/Messaging/python/messaging/messages.py
+++ b/LCS/Messaging/python/messaging/messages.py
@@ -240,8 +240,7 @@ class LofarMessage(object):
         result += "---\n"
 
         for key in _QPID_MESSAGE_FIELDS:
-            if (key != 'properties' and
-                    self.__dict__['_qpid_msg'].__dict__[key] is not None):
+            if (key != 'properties' and key in self.__dict__['_qpid_msg'].__dict__.items()):
                 result += "%s:%s\n" % (key, self.__dict__['_qpid_msg'].__dict__[key])
         result += "===\n"
         return result
diff --git a/SAS/OTDB_Services/test/t_TreeStatusEvents.py b/SAS/OTDB_Services/test/t_TreeStatusEvents.py
index f8d27cdba34b53d14fc09b482b22e80db66c4c66..dddda9a9b0d8d33ea462bc37d42c55bf424b9516 100644
--- a/SAS/OTDB_Services/test/t_TreeStatusEvents.py
+++ b/SAS/OTDB_Services/test/t_TreeStatusEvents.py
@@ -84,7 +84,7 @@ if __name__ == "__main__":
         frombus.ack(msg)
         msg.show()
         try:
-            ok = (msg.content['treeID'] == 1099266 and msg.content['state'] == 'queued')
+            ok = (msg.body['treeID'] == 1099266 and msg.body['state'] == 'queued')
         except IndexError:
             ok = False