--- a/src/pyams_scheduler/scheduler.py	Thu Aug 27 11:41:00 2015 +0200
+++ b/src/pyams_scheduler/scheduler.py	Thu Aug 27 11:41:56 2015 +0200
@@ -9,6 +9,7 @@
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
+from pyams_zmq.socket import zmq_socket, zmq_response
 
 __docformat__ = 'restructuredtext'
 
@@ -72,12 +73,11 @@
         registry = get_current_registry()
         handler = registry.settings.get(SCHEDULER_HANDLER_KEY, False)
         if handler:
-            context = zmq.Context()
-            socket = context.socket(zmq.REQ)
-            socket.connect('tcp://{0}'.format(handler))
-            return socket
+            return zmq_socket(handler)
 
     def get_jobs(self):
         socket = self._get_socket()
+        if socket is None:
+            return [501, "No socket handler defined in configuration file"]
         socket.send_json(['get_jobs', {}])
-        return socket.recv_json()
+        return zmq_response(socket)