Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -409,15 +409,20 @@
 
       ;;
       ;; set_running after our first pass through and start the db
       ;;
       (if (eq? server-state 'available)
-	  (begin
-	    (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "dbprep")
-	    (thread-sleep! 5) ;; give some margin for queries to complete before switching from file based access to server based access
-	    (set! *inmemdb*  (db:setup run-id))
-	    (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running")))
+	  (let ((new-server-id (tasks:server-am-i-the-server? (db:delay-if-busy tdbdat) run-id))) ;; try to ensure no double registering of servers
+	    (if (equal? new-server-id server-id)
+		(begin
+		  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "dbprep")
+		  (thread-sleep! 5) ;; give some margin for queries to complete before switching from file based access to server based access
+		  (set! *inmemdb*  (db:setup run-id))
+		  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running"))
+		(begin ;; gotta exit nicely
+		  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "collision")
+		  (http-transport:server-shutdown server-id port)))))
 
       (if (and (<= rem-time 4)
 	       (> rem-time 0))
 	  (thread-sleep! rem-time)
 	  (thread-sleep! 4))) ;; fallback for if the math is changed ...

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -281,24 +281,26 @@
 	    port))))))
 
 (define (tasks:server-am-i-the-server? mdb run-id)
   (let* ((all    (tasks:server-get-servers-vying-for-run-id mdb run-id))
 	 (first  (if (null? all)
-		     (begin (debug:print 0 "ERROR: no servers listed, should be at least one by now.") 
-			    (sqlite3:finalize! mdb)
-			    (exit 1))
-		     (car (db:get-rows all))))
-	 (header   (db:get-header all))
-	 (id       (db:get-value-by-header first header "id"))
-	 (hostname (db:get-value-by-header first header "hostname"))
-	 (pid      (db:get-value-by-header first header "pid"))
-	 (priority (db:get-value-by-header first header "priority")))
-    (debug:print 0 "INFO: am-i-the-server got record " first)
-    ;; for now a basic check. add tiebreaking by priority later
-    (if (and (equal? hostname (get-host-name))
-	     (equal? pid      (current-process-id)))
-	id
+		     #f;; (begin (debug:print 0 "ERROR: no servers listed, should be at least one by now.") 
+		       ;;      (sqlite3:finalize! mdb)
+		       ;;      (exit 1))
+		     (car (db:get-rows all)))))
+    (if first
+	(let* ((header   (db:get-header all))
+	       (id       (db:get-value-by-header first header "id"))
+	       (hostname (db:get-value-by-header first header "hostname"))
+	       (pid      (db:get-value-by-header first header "pid"))
+	       (priority (db:get-value-by-header first header "priority")))
+	  ;; (debug:print 0 "INFO: am-i-the-server got record " first)
+	  ;; for now a basic check. add tiebreaking by priority later
+	  (if (and (equal? hostname (get-host-name))
+		   (equal? pid      (current-process-id)))
+	      id
+	      #f))
 	#f)))
 	     
 ;; Use: (db:get-value-by-header (car (db:get-rows dat)) (db:get-header dat) "fieldname")
 ;;  to extract info from the structure returned
 ;;