diff --git a/src/main/java/com/gitblit/FileSettings.java b/src/main/java/com/gitblit/FileSettings.java
index 3caf966bf..24d86d307 100644
--- a/src/main/java/com/gitblit/FileSettings.java
+++ b/src/main/java/com/gitblit/FileSettings.java
@@ -227,6 +227,9 @@ protected boolean forceReload() {
 
 	@Override
 	public String toString() {
+		if (propertiesFile == null) {
+			return "[empty]";
+		}
 		return propertiesFile.getAbsolutePath();
 	}
 }