Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -125,10 +125,12 @@
      (debug:print 0 *default-log-port* " message: "  ((condition-property-accessor 'exn 'message) exn))       
      (vector #f (vector exn call-chain dat))) ;; return some stuff for debug if an exception happens
    (cond
     ((not (vector? dat))                    ;; it is an error to not receive a vector
      (vector #f #f "remote must be called with a vector")       )
+    ((> *api-process-request-count* 25)
+     (vector #f 'overloaded))
     (else  
      (let* ((cmd-in (vector-ref dat 0))
             (cmd    (if (symbol? cmd-in)
                         cmd-in
                         (string->symbol cmd-in)))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -206,18 +206,23 @@
 	       res)
 	      (else
 	       (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " is unknown")
 	       (mutex-unlock! *rmt-mutex*)
 	       (exit 1)))
-	    (begin
-	      (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-	      (remote-conndat-set!    runremote #f)
-	      (remote-server-url-set! runremote #f)
-              (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
-	      (mutex-unlock! *rmt-mutex*)
-	      (server:start-and-wait *toppath*)
-	      (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))))))))
+	    (if (eq? res 'overloaded)
+		(let ((wait-delay (+ attemptnum (* attemptnum 10))))
+		  (debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
+		  (thread-sleep! wait-delay)
+		  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+		(begin
+		  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
+		  (remote-conndat-set!    runremote #f)
+		  (remote-server-url-set! runremote #f)
+		  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
+		  (mutex-unlock! *rmt-mutex*)
+		  (server:start-and-wait *toppath*)
+		  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1))))))))))
 
 ;; (define (rmt:update-db-stats run-id rawcmd params duration)
 ;;   (mutex-lock! *db-stats-mutex*)
 ;;   (handle-exceptions
 ;;    exn