diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
index da332272c..347e14088 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
@@ -68,8 +68,9 @@ public class StartupStatusDisplayFilter implements Filter {
 
 		try {
 			Map<String, Object> bodyMap = new HashMap<String, Object>();
-			bodyMap.put("status", StartupStatus.getBean(ctx));
+			bodyMap.put("status", ss);
 			bodyMap.put("showLink", !isFatal());
+			bodyMap.put("contextPath", getContextPath());
 
 			hResp.setStatus(SC_INTERNAL_SERVER_ERROR);
 			Template tpl = loadFreemarkerTemplate();
@@ -79,6 +80,15 @@ public class StartupStatusDisplayFilter implements Filter {
 		}
 	}
 
+	private String getContextPath() {
+		String cp = ctx.getContextPath();
+		if ((cp == null) || cp.isEmpty()) {
+			return "The application";
+		} else {
+			return cp;
+		}
+	}
+
 	private Template loadFreemarkerTemplate() throws IOException {
 		Configuration cfg = new Configuration();
 		cfg.setTemplateLoader(new WebappTemplateLoader(ctx));
diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
index 9918816d2..649d0582d 100644
--- a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
+++ b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
@@ -79,7 +79,7 @@
     <body>
     	<#if status.errorItems?has_content>
     	    <h2>Fatal error</h2>
-    	    <p>VIVO detected a fatal error during startup.</p>
+    	    <p>${contextPath} detected a fatal error during startup.</p>
     	    <#if showLink>
                 <p><a href=".">Continue</a></p>
     	    </#if>
@@ -90,7 +90,7 @@
     
     	<#if status.warningItems?has_content>
     	    <h2>Warning</h2>
-    	    <p>VIVO issued warnings during startup.</p>
+    	    <p>${contextPath} found problems during startup.</p>
     	    <#if showLink>
                 <p><a href=".">Continue</a></p>
     	    </#if>
