diff --git a/collects/meta/drdr/metadata.rkt b/collects/meta/drdr/metadata.rkt
index 22d288927a..f3e25f46c4 100644
--- a/collects/meta/drdr/metadata.rkt
+++ b/collects/meta/drdr/metadata.rkt
@@ -68,11 +68,12 @@
                    tmp-file)
                   ; Dynamic require it
                   (begin0
-                    (dynamic-require `(file ,(path->string tmp-file))
-                                     'get-prop)
+                    (with-handlers ([exn? (λ (x) #f)])
+                      (dynamic-require `(file ,(path->string tmp-file))
+                                       'get-prop))
                     (delete-file tmp-file))))))
-  (unless props:get-prop
-    (error 'get-prop "Could not load props file for ~e" (current-rev)))
+  #;(unless props:get-prop
+     (error 'get-prop "Could not load props file for ~e" (current-rev)))
   ; XXX get-prop is stupid and errors when a-path is invalid rather than returning def
   (with-handlers ([exn? (lambda (x) def)])
     (props:get-prop a-path prop def
diff --git a/collects/meta/drdr/plt-build.rkt b/collects/meta/drdr/plt-build.rkt
index 9f4b51ab75..fa7e53336a 100644
--- a/collects/meta/drdr/plt-build.rkt
+++ b/collects/meta/drdr/plt-build.rkt
@@ -320,9 +320,10 @@
   ; And go
   (define top-sema (make-semaphore 0))
   (notify! "Starting testing")
-  (test-directory collects-pth top-sema)
-  (notify! "All testing scheduled... waiting for completion")
-  (semaphore-wait top-sema)
+  (when (directory-exists? collects-pth)
+    (test-directory collects-pth top-sema)
+    (notify! "All testing scheduled... waiting for completion")
+    (semaphore-wait top-sema))
   (notify! "Stopping testing")
   (stop-job-queue! test-workers))