diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
index a0f704b6d..a1322a8bb 100644
--- a/beetsplug/bpd/__init__.py
+++ b/beetsplug/bpd/__init__.py
@@ -584,7 +584,10 @@ class Connection(object):
 
         clist = None # Initially, no command list is being constructed.
         while True:
-            line = (yield self.sock.readline()).strip()
+            line = yield self.sock.readline() 
+            if not line:
+                break
+            line = line.strip()
             if not line:
                 break
             log.debug(line)