diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java
index d7d87c22743b..6552685a05d0 100644
--- a/core/src/main/java/hudson/slaves/Cloud.java
+++ b/core/src/main/java/hudson/slaves/Cloud.java
@@ -54,7 +54,6 @@
 import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.Validate;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -118,8 +117,14 @@ public abstract class Cloud extends Actionable implements ExtensionPoint, Descri
     public String name;
 
     protected Cloud(String name) {
-        Validate.notEmpty(name, Messages.Cloud_RequiredName());
-        this.name = name;
+        this.name = validateNotEmpty(name);
+    }
+
+    private static String validateNotEmpty(String name) {
+        if (name == null || name.isEmpty()) {
+            throw new IllegalArgumentException(Messages.Cloud_RequiredName());
+        }
+        return name;
     }
 
     @Override