Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1183,14 +1183,16 @@
 ;; params = 'target cached remparams
 (define (cdb:client-call zmq-socket . params)
   (debug:print-info 11 "cdb:client-call zmq-socket=" zmq-socket " params=" params)
   (let ((zdat (db:obj->string params)) ;; (with-output-to-string (lambda ()(serialize params))))
 	(res  #f))
+    ;; (signal-mask! signal/int)
     (send-message zmq-socket zdat)
     (set! res (db:string->obj (if *client-non-blocking-mode* 
-				  (receive-message* zmq-socket zdat)
-				  (receive-message  zmq-socket zdat))))
+				  (receive-message* zmq-socket)
+				  (receive-message  zmq-socket))))
+    ;; (signal-unmask! signal/int)
     (debug:print-info 11 "zmq-socket " (car params) " res=" res)
     res))
   
 (define (cdb:set-verbosity zmq-socket val)
   (cdb:client-call zmq-socket 'set-verbosity #f val))

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two digit decimal
 ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.5109)
+(define megatest-version 1.5110)
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -321,11 +321,12 @@
 	  (exit)))
     ;; if not list or kill then start a client (if appropriate)
     (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 	    (eq? (length (hash-table-keys args:arg-hash)) 0))
 	(debug:print-info 1 "Server connection not needed")
-	(server:client-launch do-ping: #t)))
+
+	(server:client-launch)))
 
 ;;======================================================================
 ;; Remove old run(s)
 ;;======================================================================
 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -316,16 +316,34 @@
 	      (set! *didsomething* #t)
 	      (thread-join! th3))
 	    (debug:print 0 "ERROR: Failed to setup for megatest")))
     (exit)))
 
-(define (server:client-launch #!key (do-ping #f))
-  (if (server:client-setup)
-      (debug:print-info 2 "connected as client")
-      (begin
-	(debug:print 0 "ERROR: Failed to connect as client")
-	(exit))))
+(define (server:client-signal-handler signum)
+  (handle-exceptions
+   exn
+   (debug:print " ... exiting ...")
+   (let ((th1 (make-thread (lambda ()
+			     (receive-message* *runremote*)) ;; flush out last call if applicable
+			   "eat response"))
+	 (th2 (make-thread (lambda ()
+			     (debug:print 0 "ERROR: Received ^C, attempting clean exit.")
+			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
+			     (debug:print 0 "       Done.")
+			     (exit 4))
+			   "exit on ^C timer")))
+     (thread-start! th2)
+     (thread-start! th1)
+     (thread-join! th2))))
+
+(define (server:client-launch)
+  (set-signal-handler! signal/int server:client-signal-handler)
+   (if (server:client-setup)
+       (debug:print-info 2 "connected as client")
+       (begin
+	 (debug:print 0 "ERROR: Failed to connect as client")
+	 (exit))))
 
 ;; ping a server and return number of clients or #f (if no response)
 (define (server:ping host port #!key (secs 10)(return-socket #f))
   (cdb:use-non-blocking-mode
    (lambda ()