diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1/decorator/EnsureSingleStorageVersionDecorator.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1/decorator/EnsureSingleStorageVersionDecorator.java
index 77aa560712b..93371a0c36a 100644
--- a/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1/decorator/EnsureSingleStorageVersionDecorator.java
+++ b/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1/decorator/EnsureSingleStorageVersionDecorator.java
@@ -40,7 +40,7 @@ public void andThenVisit(CustomResourceDefinitionSpecFluent<?> spec, ObjectMeta
     }
                                                                              
     for (CustomResourceDefinitionVersion version : spec.buildVersions()) {
-      if (version.getStorage()) {
+      if (version.getStorage() != null && version.getStorage()) {
         String existing = storageVersion.get();
         if (existing != null && !existing.equals(version.getName())) {
           throw new IllegalStateException(String.format(
diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1beta1/decorator/EnsureSingleStorageVersionDecorator.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1beta1/decorator/EnsureSingleStorageVersionDecorator.java
index c6526e432eb..e00d106332e 100644
--- a/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1beta1/decorator/EnsureSingleStorageVersionDecorator.java
+++ b/crd-generator/api/src/main/java/io/fabric8/crd/generator/v1beta1/decorator/EnsureSingleStorageVersionDecorator.java
@@ -41,7 +41,7 @@ public void andThenVisit(CustomResourceDefinitionSpecFluent<?> spec, ObjectMeta
     }
 
     for (CustomResourceDefinitionVersion version : spec.buildVersions()) {
-      if (version.getStorage()) {
+      if (version.getStorage() != null && version.getStorage()) {
         String existing = storageVersion.get();
         if (existing != null && !existing.equals(version.getName())) {
           throw new IllegalStateException(String.format(