diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
index 681331a85..e909bdc2f 100644
--- a/beetsplug/bpd/__init__.py
+++ b/beetsplug/bpd/__init__.py
@@ -583,9 +583,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()
             log.debug(line)
                
             if clist is not None: