diff --git a/deploy-service/common/src/main/java/com/pinterest/deployservice/common/KnoxKeyReader.java b/deploy-service/common/src/main/java/com/pinterest/deployservice/common/KnoxKeyReader.java
index 7a16fef57e..d8c2a70318 100644
--- a/deploy-service/common/src/main/java/com/pinterest/deployservice/common/KnoxKeyReader.java
+++ b/deploy-service/common/src/main/java/com/pinterest/deployservice/common/KnoxKeyReader.java
@@ -73,6 +73,10 @@ private String getKeyInternal() {
             LOG.warn("Using default key since knoxManager is null");
             return defaultKeyContent;
         }
-        return knoxManager.getKey().trim();
+        String key = knoxManager.getKey();
+        if (key != null) {
+            return key.trim();
+        }
+        return key;
     }
 }