diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java
index 0b52c224d0f..27ec6c036d6 100644
--- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java
+++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java
@@ -26,7 +26,9 @@ public interface Waitable<T, P> {
    * Wait for the given condition to be true.
    * <p>
    * The processing of events will be in the IO thread, blocking operations should be avoided.
-   * 
+   * <p>
+   * If nothing exists, the condition will be tested with a null value.
+   *
    * @param condition
    * @param amount
    * @param timeUnit
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/GenericClusterScopedCustomResourceIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/GenericClusterScopedCustomResourceIT.java
index 5e64e5ce7ba..f057f99f595 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/GenericClusterScopedCustomResourceIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/GenericClusterScopedCustomResourceIT.java
@@ -51,8 +51,9 @@ public static void initCrd() {
     client.apiextensions().v1().customResourceDefinitions()
         .withName("satellites.demos.fabric8.io")
         .waitUntilCondition(
-            c -> c.getStatus() != null && c.getStatus().getConditions() != null && c.getStatus().getConditions().stream()
-                .anyMatch(crdc -> crdc.getType().equals("Established") && crdc.getStatus().equals("True")),
+            c -> c != null && c.getStatus() != null && c.getStatus().getConditions() != null
+                && c.getStatus().getConditions().stream()
+                    .anyMatch(crdc -> crdc.getType().equals("Established") && crdc.getStatus().equals("True")),
             10L, TimeUnit.SECONDS);
   }