diff --git a/nfc/handover/server.py b/nfc/handover/server.py
index <HASH>..<HASH> 100644
--- a/nfc/handover/server.py
+++ b/nfc/handover/server.py
@@ -70,8 +70,8 @@ class HandoverServer(Thread):
                             break # message complete
                         except nfc.ndef.LengthError:
                             continue # need more data
-                    else:
-                        return # connection closed
+                    else: return # connection closed
+                else: return # connection closed
 
                 log.debug("<<< {0!r}".format(request_data))
                 response = handover_server._process_request(request)
handle connection closed also if llcp.poll() returns false