diff --git a/ms2/src/org/labkey/ms2/MS2Controller.java b/ms2/src/org/labkey/ms2/MS2Controller.java
index ed21541169..9fa29e45eb 100644
--- a/ms2/src/org/labkey/ms2/MS2Controller.java
+++ b/ms2/src/org/labkey/ms2/MS2Controller.java
@@ -227,10 +227,13 @@ private NavTree appendRunNavTrail(NavTree root, MS2Run run, URLHelper runURL, St
     {
         appendRootNavTrail(root, null, page, helpTopic);
 
-        if (null != runURL)
-            root.addChild(run.getDescription(), runURL);
-        else
-            root.addChild(run.getDescription());
+        if (null != run)
+        {
+            if (null != runURL)
+                root.addChild(run.getDescription(), runURL);
+            else
+                root.addChild(run.getDescription());
+        }
 
         if (null != title)
             root.addChild(title);