diff --git a/tools/chakana/shepherd.py b/tools/chakana/shepherd.py
index 89b6f1986..ef0ce8133 100644
--- a/tools/chakana/shepherd.py
+++ b/tools/chakana/shepherd.py
@@ -283,6 +283,8 @@ class Shepherd:
       if response.documentElement.tagName == 'error':
         raise chakana.error.CoojaError(response)
       return response
+    except socket.error:
+      debug(MajorEvent, 'Socket error catched')
     finally:
       self._connectionLock.release()