diff --git a/flow/src/org/labkey/flow/controllers/run/RunController.java b/flow/src/org/labkey/flow/controllers/run/RunController.java
index 53866096cc..934f1418b7 100644
--- a/flow/src/org/labkey/flow/controllers/run/RunController.java
+++ b/flow/src/org/labkey/flow/controllers/run/RunController.java
@@ -175,6 +175,10 @@ public class ShowRunsAction extends SimpleViewAction<RunsForm>
         public ModelAndView getView(RunsForm form, BindException errors)
         {
             experiment = form.getExperiment();
+            if (experiment == null)
+            {
+                throw new NotFoundException();
+            }
 //            script = form.getScript();
 
             checkContainer(experiment);