diff --git a/core/src/main/java/hudson/util/Secret.java b/core/src/main/java/hudson/util/Secret.java
index d53054cec9..a063c0fb4b 100644
--- a/core/src/main/java/hudson/util/Secret.java
+++ b/core/src/main/java/hudson/util/Secret.java
@@ -303,6 +303,9 @@ public final class Secret implements Serializable {
     static {
         Stapler.CONVERT_UTILS.register(new org.apache.commons.beanutils.Converter() {
             public Secret convert(Class type, Object value) {
+                if (value == null) {
+                    return null;
+                }
                 if (value instanceof Secret) {
                     return (Secret) value;
                 }