@@ -37,10 +37,13 @@
 (declare (uses dbmod))
 (import dbmod)
 
 (declare (uses configfmod))
 (import configfmod)
+
+(declare (uses servermod))
+(import servermod)
 
 (include "common_records.scm")
 ;; (declare (uses rmtmod))
 
 ;; (import rmtmod)
@@ -104,11 +107,22 @@
   ;;DOT   node [shape="box"];
   ;;DOT "rmt:send-receive" -> MUTEXLOCK;
   ;;DOT { edge [style=invis];"case 1" -> "case 2" -> "case 3" -> "case 4" -> "case 5" -> "case 6" -> "case 7" -> "case 8" -> "case 9" -> "case 10" -> "case 11"; }
   ;; do all the prep locked under the rmt-mutex
   (mutex-lock! *rmt-mutex*)
-  
+
+  ;; set up runremote record earlier than the loop below
+  (if (not area-dat)                   ;; can remove this one. should never get here.         
+      (begin
+	(set! *runremote* (create-remote-record))
+	(let* ((server-info (remote-server-info *runremote*))) 
+	  (if server-info
+	      (begin
+		(remote-server-url-set! *runremote* (server:record->url server-info))
+		(remote-server-id-set! *runremote* (server:record->id server-info)))))  
+	(set! area-dat *runremote*))) ;; new runremote will come from this on next iteration
+    
   ;; 1. check if server is started IFF cmd is a write OR if we are not on the homehost, store in runremote
   ;; 2. check the age of the connections. refresh the connection if it is older than timeout-20 seconds.
   ;; 3. do the query, if on homehost use local access
   ;;
   (let* ((start-time    (current-seconds)) ;; snapshot time so all use cases get same value
@@ -120,20 +134,10 @@
 
     ;; DOT INIT_RUNREMOTE; // leaving off - doesn't really add to the clarity
     ;; DOT MUTEXLOCK -> INIT_RUNREMOTE [label="no remote?"];
     ;; DOT INIT_RUNREMOTE -> MUTEXLOCK;
     ;; ensure we have a record for our connection for given area
-    (if (not runremote)                   ;; can remove this one. should never get here.         
-	(begin
-	  (set! *runremote* (create-remote-record))
-          (let* ((server-info (remote-server-info *runremote*))) 
-            (if server-info
-		(begin
-			(remote-server-url-set! *runremote* (server:record->url server-info))
-			(remote-server-id-set! *runremote* (server:record->id server-info)))))  
-	  (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
-    
     ;; DOT SET_HOMEHOST; // leaving off - doesn't really add to the clarity
     ;; DOT MUTEXLOCK -> SET_HOMEHOST [label="no homehost?"];
     ;; DOT SET_HOMEHOST -> MUTEXLOCK;
     ;; ensure we have a homehost record
     (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost