--- pympd-0.07.old/src/modules/pympdclient2.py	2007-11-11 17:29:42.000000000 +0000
+++ pympd-0.07/src/modules/pympdclient2.py	2007-11-11 17:31:09.000000000 +0000
@@ -1,5 +1,7 @@
 import mpdlib2
 import threading
+import socket
+import errno
 
 def fillSong(song):
     if not song.has_key('artist'):
@@ -52,9 +54,15 @@
         try:
             self.mpd = mpdlib2.connect(host=mpd_host, port=mpd_port, password=mpd_password, timeout=mpd_timeout)
 
-            return True
-        except:
-            return False
+            return ""
+        except socket.error, sock_err:
+            if isinstance(sock_err, socket.timeout):
+                return str(sock_err)
+            else:
+                return (sock_err[0] == errno.EINPROGRESS and os.strerror(errno.ETIMEDOUT) \
+                            or sock_err[1])
+        except Exception, msg:
+            return msg
 
     #updated
     # should work without adjustments.