@@ -402,20 +402,23 @@
   (let* ((item-path (item-list->path itemdat))
 	 (testdat   (db:get-test-info db run-id test-name item-path)))
     (equal? (test:get-state testdat) "KILLREQ")))
 
 (define (test:tdb-get-rundat-count tdb)
-  (let ((res 0))
-    (sqlite3:for-each-row
-     (lambda (count)
-       (set! res count))
-     tdb
-     "SELECT count(id) FROM test_rundat;")
-    res))
-
-(define (test-set-meta-info db tdb run-id testname itemdat #!key (minutes #f))
-  (let* ((num-records (test:tdb-get-rundat-count tdb))
+  (if tdb
+      (let ((res 0))
+	(sqlite3:for-each-row
+	 (lambda (count)
+	   (set! res count))
+	 tdb
+	 "SELECT count(id) FROM test_rundat;")
+	res))
+  0)
+
+(define (test-set-meta-info db test-id run-id testname itemdat #!key (minutes #f))
+  (let* ((tdb         (db:open-test-db-by-test-id db test-id))
+	 (num-records (test:tdb-get-rundat-count tdb))
 	 (item-path   (item-list->path itemdat))
 	 (cpuload  (get-cpu-load))
 	 (diskfree (get-df (current-directory))))
     (if (eq? (modulo num-records 10) 0) ;; every ten records update central
 	(begin