X-Git-Url: http://git.kaliko.me/?p=python-musicpd.git;a=blobdiff_plain;f=mpd.py;h=bd68b3cf4c4cd26d7088014de89b1509535fa7ef;hp=ae1f2b3c349a6360127ecd06f86451432d3f453d;hb=202767471f017c54d1ba73e2ad4bedca5ef0d40f;hpb=3bbc456dc51c95e8ad5bb4e270d781ed370bfe27

diff --git a/mpd.py b/mpd.py
index ae1f2b3..bd68b3c 100644
--- a/mpd.py
+++ b/mpd.py
@@ -307,7 +307,11 @@ class MPDClient(object):
             raise socket.error, msg
         self._rfile = self._sock.makefile("rb")
         self._wfile = self._sock.makefile("wb")
-        self._hello()
+        try:
+            self._hello()
+        except (socket.error, MPDError):
+            self.disconnect()
+            raise
 
     def disconnect(self):
         self._rfile.close()