diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index 7f6b3fa69831aaa09bcea7048d38dca4691ef69d..68b0dde82102c9e4596b47899ebb920c48eab63c 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -436,8 +436,9 @@ public class I2PAppContext {
      */
     public String getProperty(String propName) {
         if (_overrideProps != null) {
-            if (_overrideProps.containsKey(propName))
-                return _overrideProps.getProperty(propName);
+            String rv = _overrideProps.getProperty(propName);
+            if (rv != null)
+                return rv;
         }
         return System.getProperty(propName);
     }