Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -50,11 +50,11 @@
 (define *client-non-blocking-mode* #f)
 (define *server-id*         #f)
 (define *server-info*       #f)
 (define *time-to-exit*      #f)
 (define *received-response* #f)
-(define *default-numtries*  5)
+(define *default-numtries*  10)
 
 (define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
 (define *keys*              (make-hash-table)) ;; cache the keys here
 (define *keyvals*           (make-hash-table))
 (define *toptest-paths*     (make-hash-table)) ;; cache toptest path settings here

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1110,53 +1110,58 @@
 ;;
 ;; make-vector-record cdb packet client-sig qtype immediate query-sig params qtime
 ;;
 (define (cdb:client-call zmq-sockets qtype immediate numretries . params)
   (debug:print-info 11 "cdb:client-call zmq-sockets=" zmq-sockets ", qtype=" qtype ", immediate=" immediate ", numretries=" numretries ", params=" params)
-  (let* ((push-socket (vector-ref zmq-sockets 0))
-	 (sub-socket  (vector-ref zmq-sockets 1))
-	 (client-sig  (server:get-client-signature))
-	 (query-sig   (message-digest-string (md5-primitive) (conc qtype immediate params)))
-	 (zdat        (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds)))) ;; (with-output-to-string (lambda ()(serialize params))))
-	 (res  #f)
-	 (send-receive (lambda ()
-			 (debug:print-info 11 "sending message")
-			 (send-message push-socket zdat)
-			 (debug:print-info 11 "message sent")
-			 (let loop ()
-			   ;; get the sender info
-			   ;; this should match (server:get-client-signature)
-			   ;; we will need to process "all" messages here some day
-			   (receive-message* sub-socket)
-			   ;; now get the actual message
-			   (let ((myres (db:string->obj (receive-message* sub-socket))))
-			     (if (equal? query-sig (vector-ref myres 1))
-				 (set! res (vector-ref myres 2))
-				 (loop))))))
-	 (timeout (lambda ()
-		    (let loop ((n numretries))
-		      (thread-sleep! 60)
-		      (if (not res)
-			  (if (> numretries 0)
-			      (begin
-				(debug:print 0 "WARNING: no reply to query " params ", trying resend")
-				(debug:print-info 11 "re-sending message")
-				(send-message push-socket zdat)
-				(debug:print-info 11 "message re-sent")
-				(loop (- n 1)))
-			      ;; (apply cdb:client-call zmq-sockets qtype immediate (- numretries 1) params))
-			      (begin
-				(debug:print 0 "ERROR: cdb:client-call timed out " params ", exiting.")
-				(exit 5))))))))
-    (debug:print-info 11 "Starting threads")
-    (let ((th1 (make-thread send-receive "send receive"))
-	  (th2 (make-thread timeout      "timeout")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join!  th1)
-      (debug:print-info 11 "cdb:client-call returning res=" res)
-      res)))
+  (handle-exceptions
+   exn
+   (begin
+     (thread-sleep! 5) 
+     (if (> numretries 0)(apply cdb:client-call zmq-sockets qtype immediate (- numretries 1) params)))
+   (let* ((push-socket (vector-ref zmq-sockets 0))
+	  (sub-socket  (vector-ref zmq-sockets 1))
+	  (client-sig  (server:get-client-signature))
+	  (query-sig   (message-digest-string (md5-primitive) (conc qtype immediate params)))
+	  (zdat        (db:obj->string (vector client-sig qtype immediate query-sig params (current-seconds)))) ;; (with-output-to-string (lambda ()(serialize params))))
+	  (res  #f)
+	  (send-receive (lambda ()
+			  (debug:print-info 11 "sending message")
+			  (send-message push-socket zdat)
+			  (debug:print-info 11 "message sent")
+			  (let loop ()
+			    ;; get the sender info
+			    ;; this should match (server:get-client-signature)
+			    ;; we will need to process "all" messages here some day
+			    (receive-message* sub-socket)
+			    ;; now get the actual message
+			    (let ((myres (db:string->obj (receive-message* sub-socket))))
+			      (if (equal? query-sig (vector-ref myres 1))
+				  (set! res (vector-ref myres 2))
+				  (loop))))))
+	  (timeout (lambda ()
+		     (let loop ((n numretries))
+		       (thread-sleep! 15)
+		       (if (not res)
+			   (if (> numretries 0)
+			       (begin
+				 (debug:print 2 "WARNING: no reply to query " params ", trying resend")
+				 (debug:print-info 11 "re-sending message")
+				 (send-message push-socket zdat)
+				 (debug:print-info 11 "message re-sent")
+				 (loop (- n 1)))
+			       ;; (apply cdb:client-call zmq-sockets qtype immediate (- numretries 1) params))
+			       (begin
+				 (debug:print 0 "ERROR: cdb:client-call timed out " params ", exiting.")
+				 (exit 5))))))))
+     (debug:print-info 11 "Starting threads")
+     (let ((th1 (make-thread send-receive "send receive"))
+	   (th2 (make-thread timeout      "timeout")))
+       (thread-start! th1)
+       (thread-start! th2)
+       (thread-join!  th1)
+       (debug:print-info 11 "cdb:client-call returning res=" res)
+       res))))
   
 (define (cdb:set-verbosity zmq-socket val)
   (cdb:client-call zmq-socket 'set-verbosity #f *default-numtries* val))
 
 (define (cdb:login zmq-sockets keyval signature)