From d263b9abb8be1334e3766957207d8c91bd013b6b Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Tue, 23 Apr 2019 09:31:02 -0700
Subject: [PATCH] More targeted NPE prevention. `null` experiment is sometimes
 expected

---
 .../labkey/flow/controllers/run/RunController.java   |  4 ----
 .../org/labkey/flow/controllers/run/RunsForm.java    | 12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/flow/src/org/labkey/flow/controllers/run/RunController.java b/flow/src/org/labkey/flow/controllers/run/RunController.java
index 934f1418b7..53866096cc 100644
--- a/flow/src/org/labkey/flow/controllers/run/RunController.java
+++ b/flow/src/org/labkey/flow/controllers/run/RunController.java
@@ -175,10 +175,6 @@ 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);
diff --git a/flow/src/org/labkey/flow/controllers/run/RunsForm.java b/flow/src/org/labkey/flow/controllers/run/RunsForm.java
index 642e3e9d9f..cfb0c95b4e 100644
--- a/flow/src/org/labkey/flow/controllers/run/RunsForm.java
+++ b/flow/src/org/labkey/flow/controllers/run/RunsForm.java
@@ -16,14 +16,14 @@
 
 package org.labkey.flow.controllers.run;
 
-import org.labkey.flow.query.FlowQueryForm;
-import org.labkey.flow.query.FlowSchema;
-import org.labkey.flow.query.FlowTableType;
-import org.labkey.flow.data.FlowExperiment;
-import org.labkey.flow.data.FlowScript;
 import org.labkey.api.query.QuerySettings;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.view.ActionURL;
+import org.labkey.flow.data.FlowExperiment;
+import org.labkey.flow.data.FlowScript;
+import org.labkey.flow.query.FlowQueryForm;
+import org.labkey.flow.query.FlowSchema;
+import org.labkey.flow.query.FlowTableType;
 
 /**
  * User: kevink
@@ -88,7 +88,7 @@ public QuerySettings createQuerySettings(UserSchema schema)
 
         // adding the filter doesn't work because of bug 6520
         // 6520 : can't set filter/sort on QuerySettings progamatically
-        if (getScript() != null)
+        if (getScript() != null && getScript().getExpObject() != null)
         {
             ActionURL sortFilter = getScript().getRunsUrl(ret.getSortFilterURL());
             ret.setSortFilterURL(sortFilter);