@@ -52,10 +52,19 @@
 	  (if cinfo
 	      cinfo
 	      (if (server:check-if-running areapath)
 		  (client:setup areapath)
 		  #f))))
+
+(define (rmt:on-homehost? runremote)
+  (let* ((hh-dat (remote-hh-dat runremote)))
+    (if (pair? hh-dat)
+	(cdr hh-dat)
+	(begin
+	  (debug:print-info 0 *default-log-port* "hh-dat="hh-dat)
+	  #f))))
+
 
 ;;======================================================================
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
 
@@ -177,11 +186,11 @@
      ;;DOT MUTEXLOCK -> CASE5 [label="server not required,\non homehost,\nread-only query"]; {rank=same "case 5" CASE5};
      ;;DOT CASE5 -> "rmt:open-qry-close-locally";
 
      ;; on homehost and this is a read
      ((and (not (remote-force-server runremote)) ;; honor forced use of server, i.e. server NOT required
-	   (cdr (remote-hh-dat runremote))       ;; on homehost
+	   (rmt:on-homehost? runremote)
            (member cmd api:read-only-queries))   ;; this is a read
       (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5")
       (rmt:open-qry-close-locally cmd 0 params))