diff --git a/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java b/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
index bf36aef0c1..a1f9118376 100644
--- a/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
+++ b/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
@@ -34,6 +34,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.zanata.ApplicationConfiguration;
+import org.zanata.config.SystemPropertyConfigStore;
 import org.zanata.dao.DocumentDAO;
 import org.zanata.model.HDocument;
 import org.zanata.model.HProject;
@@ -97,7 +98,8 @@ private File ensureDocsDirectory() {
                 appConfig.getDocumentFileStorageLocation();
         if (basePathStringOrNull == null) {
             throw new RuntimeException(
-                    "Document storage location is not configured in JNDI.");
+                    "Document storage location is not configured as system property:" +
+                            SystemPropertyConfigStore.KEY_DOCUMENT_FILE_STORE);
         }
         File docsDirectory =
                 new File(basePathStringOrNull, RAW_DOCUMENTS_SUBDIRECTORY);