SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/internal/Require.java‎
Lines changed: 10 additions & 3 deletions b/‎java/client/src/org/openqa/selenium/internal/Require.java‎
Lines changed: 10 additions & 3 deletions
diff --git a/‎java/client/test/org/openqa/selenium/RequireTest.java‎
Lines changed: 7 additions & 0 deletions b/‎java/client/test/org/openqa/selenium/RequireTest.java‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎java/server/src/org/openqa/selenium/grid/data/NodeStatus.java‎
Lines changed: 3 additions & 1 deletion b/‎java/server/src/org/openqa/selenium/grid/data/NodeStatus.java‎
Lines changed: 3 additions & 1 deletion
@@ -138,17 +138,24 @@ public static int nonNegative(String argName, Integer number) {
     }
     return number;
   }
-
-  public static int positive(String argName, Integer number) {
+  public static int positive(String argName, Integer number, String message) {
     if (number == null) {
       throw new IllegalArgumentException(argName + " must be set");
     }
     if (number <= 0) {
-      throw new IllegalArgumentException(argName + " must be greater than 0");
+      if (message == null) {
+        throw new IllegalArgumentException(argName + " must be greater than 0");
+      } else {
+        throw new IllegalArgumentException(message);
+      }
     }
     return number;
   }
 
+  public static int positive(String argName, Integer number) {
+    return positive(argName, number, null);
+  }
+
   public static IntChecker argument(String argName, Integer number) {
     return new IntChecker(argName, number);
   }
 
@@ -145,6 +145,13 @@ public void canCheckIntegerArgument() {
     assertThat(Require.positive("Timeout", 5)).isEqualTo(5);
   }
 
+  @Test
+  public void canCheckIntegersWithMessages() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> Require.positive("Timeout", 0, "Message should only be this"))
+        .withMessage("Message should only be this");
+  }
+
   @Test
   public void canCheckIntegerArgumentWithCheckerObject() {
     assertThatExceptionOfType(IllegalArgumentException.class)
 
@@ -51,7 +51,9 @@ public NodeStatus(
       Secret registrationSecret) {
     this.nodeId = Require.nonNull("Node id", nodeId);
     this.externalUri = Require.nonNull("URI", externalUri);
-    this.maxSessionCount = Require.positive("Max session count", maxSessionCount);
+    this.maxSessionCount = Require.positive("Max session count",
+        maxSessionCount,
+"Make sure that a driver is available on $PATH");
     this.slots = ImmutableSet.copyOf(Require.nonNull("Slots", slots));
     this.availability = Require.nonNull("Availability", availability);
     this.registrationSecret = registrationSecret;
Original file line number	Diff line number	Diff line change
`@@ -138,17 +138,24 @@ public static int nonNegative(String argName, Integer number) {`
`138`	`138`	`}`
`139`	`139`	`return number;`
`140`	`140`	`}`
`141`		`-`
`142`		`- public static int positive(String argName, Integer number) {`
	`141`	`+ public static int positive(String argName, Integer number, String message) {`
`143`	`142`	`if (number == null) {`
`144`	`143`	`throw new IllegalArgumentException(argName + " must be set");`
`145`	`144`	`}`
`146`	`145`	`if (number <= 0) {`
`147`		`- throw new IllegalArgumentException(argName + " must be greater than 0");`
	`146`	`+ if (message == null) {`
	`147`	`+ throw new IllegalArgumentException(argName + " must be greater than 0");`
	`148`	`+ } else {`
	`149`	`+ throw new IllegalArgumentException(message);`
	`150`	`+ }`
`148`	`151`	`}`
`149`	`152`	`return number;`
`150`	`153`	`}`
`151`	`154`
	`155`	`+ public static int positive(String argName, Integer number) {`
	`156`	`+ return positive(argName, number, null);`
	`157`	`+ }`
	`158`	`+`
`152`	`159`	`public static IntChecker argument(String argName, Integer number) {`
`153`	`160`	`return new IntChecker(argName, number);`
`154`	`161`	`}`