diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 29dbd66cc37bd9b3847f535cf2977d32ba827cec..4e94c0b9ab9ed307c976132d18a662c38eb11c46 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -522,7 +522,7 @@ public class Util {
      */
     public static String fixEmptyAndTrim(String s) {
         if(s==null)    return null;
-        return s.trim();
+        return fixEmpty(s.trim());
     }
 
     /**