diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java
index 6f6770e4a0f16d8e6367576e2ea90bf04598f11b..d43bfc0f584cfd72217c1945563876451a082d4d 100644
--- a/core/src/main/java/hudson/scm/CVSSCM.java
+++ b/core/src/main/java/hudson/scm/CVSSCM.java
@@ -93,7 +93,6 @@ import java.util.Set;
 import java.util.TimeZone;
 import java.util.TreeSet;
 import java.util.logging.Logger;
-import java.util.logging.Level;
 import static java.util.logging.Level.INFO;
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
@@ -153,7 +152,7 @@ public class CVSSCM extends SCM implements Serializable {
         if(fixNull(branch).equals("HEAD"))
             branch = null;
 
-        this.cvsroot = cvsRoot;
+        this.cvsroot = fixNull(cvsRoot).trim();
         this.module = module.trim();
         this.branch = nullify(branch);
         this.cvsRsh = nullify(cvsRsh);