Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -2636,28 +2636,12 @@
        'old2new
        )
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-import-sexpr")
- (let*(
-   (toppath (launch:setup))
-   (tmppath (common:make-tmpdir-name toppath "")))
-   (if (file-exists? (conc toppath "/.mtdb")) 
-     (if (args:get-arg "-remove-dbs")
-       (let* ((dbfiles (conc toppath "/.mtdb/* " tmppath "/*")))
-        (debug:print 0 *default-log-port* "Removing db files: " dbfiles)
-        (system (conc "rm -rvf " dbfiles))
-       )
-       (begin
-         (debug:print 0 *default-log-port* "ERROR: Cannot import sexpr with an existing DB present.")
-         (debug:print 0 *default-log-port* "Add '-remove-dbs all'  to remove the current Megatest DBs.")
-         (set! *didsomething* #t)
-         (exit)
-       )
-     )
-   )
-   (db:setup)
+ (begin
+   (launch:setup)
    (rmt:import-sexpr (args:get-arg "-import-sexpr"))
    (set! *didsomething* #t)))
 
 (if (args:get-arg "-sync-to-megatest.db")
     (let* ((duh      (launch:setup))

Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -122,12 +122,22 @@
 	(simple-run-id (car runs))
        ))))
 
 (define (rmt:insert-test run-id test-rec)
   (let* ((testname  (alist-ref "testname" test-rec equal?))
-	 (item-path (alist-ref "item_path" test-rec equal?)))
-    (rmtmod:send-receive 'insert-test run-id test-rec)))
+	 (item-path (alist-ref "item_path" test-rec equal?))
+         (test-id (rmt:get-test-id run-id testname item-path))
+         )
+        (if test-id
+          (debug:print 0 *default-log-port* "test "testname"/"item-path " already exists in run-id " run-id)
+          (begin
+            (debug:print 0 *default-log-port* " Insert test in run "run-id": "testname"/"item-path)
+            (rmtmod:send-receive 'insert-test run-id test-rec)
+          )
+        )
+  )
+)
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================