diff --git a/flow/src/org/labkey/flow/controllers/WorkspaceData.java b/flow/src/org/labkey/flow/controllers/WorkspaceData.java
index bd2f825cc3..bf2be0da1d 100644
--- a/flow/src/org/labkey/flow/controllers/WorkspaceData.java
+++ b/flow/src/org/labkey/flow/controllers/WorkspaceData.java
@@ -28,6 +28,9 @@
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.ViewContext;
 import org.labkey.flow.analysis.model.Analysis;
+import org.labkey.api.util.SessionHelper;
+import org.labkey.api.view.HttpView;
+import org.labkey.api.view.ViewContext;
 import org.labkey.flow.analysis.model.FlowException;
 import org.labkey.flow.analysis.model.ISampleInfo;
 import org.labkey.flow.analysis.model.IWorkspace;
@@ -56,6 +59,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.labkey.api.action.SpringActionController.ERROR_MSG;
+import java.util.concurrent.TimeUnit;
 
 public class WorkspaceData implements Serializable
 {
@@ -86,6 +90,7 @@ public String getPath()
 
     public void setOriginalPath(String path)
     {
+        Map<String, String> ret = new HashMap<>();
         if (path != null)
         {
             path = PageFlowUtil.decode(path);
@@ -350,7 +355,8 @@ private void addCaseSensitiveWarnings(Errors errors, List<String> messages, bool
             for (String msg : messages)
                 errors.reject(ERROR_MSG, msg);
         }
-        else
+
+        if (_object != null && token == null)
         {
             _object.getWarnings().addAll(messages);
         }
diff --git a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
index 9df06acaa7..1257b4d567 100644
--- a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
+++ b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
@@ -40,6 +40,7 @@
 import org.labkey.api.assay.AssayFileWriter;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Pair;
+import org.labkey.api.util.SessionHelper;
 import org.labkey.api.util.URIUtil;
 import org.labkey.api.util.URLHelper;
 import org.labkey.api.view.ActionURL;