From a1dc4fcf59bc46c0ee065ad4e3b3ba55f74cb375 Mon Sep 17 00:00:00 2001
From: William Welling <wwelling@library.tamu.edu>
Date: Fri, 4 Sep 2020 09:09:43 -0500
Subject: [PATCH] add additional null checks to ensure context is ready for
 theme change

---
 .../main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
index ba264f9861..85f58495de 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
@@ -230,7 +230,9 @@ private void checkForChangeInThemeDirectory(ServletContext ctx) {
 		WebappDaoFactory wdf = ModelAccess.on(ctx)
 			.getWebappDaoFactory();
 		// Only applicable if context has a complete model access
-		if (Objects.nonNull(wdf)) {
+		if (Objects.nonNull(wdf)
+				&& Objects.nonNull(wdf.getApplicationDao())
+				&& Objects.nonNull(wdf.getApplicationDao().getApplicationBean())) {
 			String currentDir = wdf
 				.getApplicationDao()
 				.getApplicationBean()