diff --git a/api/src/org/labkey/api/util/JunitUtil.java b/api/src/org/labkey/api/util/JunitUtil.java
index 492c1156d9d..104351e94f1 100644
--- a/api/src/org/labkey/api/util/JunitUtil.java
+++ b/api/src/org/labkey/api/util/JunitUtil.java
@@ -233,22 +233,26 @@ public static void createRaces(final Runnable runnable, final int threads, final
                     }
 
                     sampleDataDir = _sampleDataDirectories.get(name);
-
-                    if (sampleDataDir == null)
-                    {
-                        Assert.fail("Sample data directory not found for module: " + name + ". Known directories: " + _sampleDataDirectories);
-                    }
                 }
             }
         }
 
-        File file = FileUtil.appendPath(sampleDataDir, Path.parse(relativePath));
-        if (file.exists())
-            return file;
+        String message;
+
+        if (sampleDataDir != null)
+        {
+            File file = FileUtil.appendPath(sampleDataDir, Path.parse(relativePath));
+            if (file.exists())
+                return file;
 
-        String message = "No sample data found at [" + file.getAbsolutePath() + "].";
+            message = "No sample data found at [" + file.getAbsolutePath() + "].";
+        }
+        else
+        {
+            message = "No sample data found at [" + relativePath + "].";
+        }
 
-        if (null != module)
+        if (module != null)
         {
             if (sampleDataDir == null || !sampleDataDir.exists())
             {