From 28aada122d550ef2acba3eeabc524ba8f9c97b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Fri, 13 Jul 2018 18:09:48 +0200
Subject: [PATCH] Fix it better

---
 gajim/common/connection_handlers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gajim/common/connection_handlers.py b/gajim/common/connection_handlers.py
index ccd107d4a..952e768d9 100644
--- a/gajim/common/connection_handlers.py
+++ b/gajim/common/connection_handlers.py
@@ -533,7 +533,10 @@ class ConnectionHandlersBase:
         # We got our message's receipt
         if obj.receipt_received_tag and app.config.get_per('accounts',
         self.name, 'request_receipt'):
-            if obj.session and not obj.session.ctrl:
+            ctrl = None
+            if obj.session is not None:
+                ctrl = obj.session.control
+            if not ctrl:
                 # Received <message> doesn't have the <thread> element
                 # or control is not bound to session?
                 # --> search for it