diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java
index 7574bd38967..fb975b9bab2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java
@@ -157,7 +157,7 @@ public String getBasicAuthPassword() {
 
   public SolrRequest(METHOD m, String path, SolrRequestType requestType) {
     this.method = m;
-    this.path = path;
+    this.path = validatePath(path);
     this.requestType = requestType;
   }
 
@@ -182,11 +182,14 @@ public String getPath() {
   }
 
   public void setPath(String path) {
-    if (path == null || !path.startsWith("/")) {
+    this.path = validatePath(path);
+  }
+
+  private static String validatePath(String path) {
+    if (path != null && !path.startsWith("/")) {
       throw new IllegalArgumentException("Must start with a '/': " + path);
     }
-
-    this.path = path;
+    return path;
   }
 
   /**