diff --git a/gotr/manifest.ini b/gotr/manifest.ini
index 15cd2c6..6fcb8b9 100644
--- a/gotr/manifest.ini
+++ b/gotr/manifest.ini
@@ -1,7 +1,7 @@
 [info]
 name: Off-The-Record Encryption
 short_name: gotr
-version: 1.5
+version: 1.6
 description: See http://www.cypherpunks.ca/otr/
 authors: Kjell Braden <afflux.gajim@pentabarf.de>
 homepage: http://gajim-otr.pentabarf.de
diff --git a/gotr/otrmodule.py b/gotr/otrmodule.py
index 4ce5199..890ef5e 100644
--- a/gotr/otrmodule.py
+++ b/gotr/otrmodule.py
@@ -97,11 +97,11 @@ class GajimContext(potr.context.Context):
         account = self.user.accountname
 
         stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat')
-        if appdata and 'session' in appdata:
-            session = appdata['session']
-            stanza.setThread(session.thread_id)
+        if appdata is not None:
+            session = appdata.get('session', None)
+            if session is not None:
+                stanza.setThread(session.thread_id)
         gajim.connections[account].connection.send(stanza, now=True)
-        return
 
     def setState(self, newstate):
         if self.state == potr.context.STATE_ENCRYPTED: