diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad2f486e6f..878e17f8f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ Usage:
 * Fix #53: Renamed plugins to openshift/kubernetes-maven-plugin keeping acronym (oc/k8s) for goal
 * Fix #97:  Port of fabric8io/fabric8-maven-plugin#1794 to fix ImageChange triggers not being set in DeploymentConfig when resource fragments are used
 * Ported PR fabric8io/fabric8-maven-plugin#1802, Labels are missing for some objects
+* Ported PR fabric8io/fabric8-maven-plugin#1805, NullPointerException in ConfigMapEnricher
 * Fix #112: Fix windows specific path error while splitting file path
 
 ### 0.2.0 (05-03-2020)
diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/ConfigMapEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/ConfigMapEnricher.java
index 12d70b1f7c..09dc16b1bb 100644
--- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/ConfigMapEnricher.java
+++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/ConfigMapEnricher.java
@@ -56,10 +56,12 @@ private void addAnnotations(KubernetesListBuilder builder) {
             @Override
             public void visit(ConfigMapBuilder element) {
                 final Map<String, String> annotations = element.buildMetadata().getAnnotations();
-                try {
-                    addConfigMapFromAnnotations(annotations, element);
-                } catch (IOException e) {
-                    throw new IllegalArgumentException(e);
+                if (annotations != null) {
+                    try {
+                        addConfigMapFromAnnotations(annotations, element);
+                    } catch (IOException e) {
+                        throw new IllegalArgumentException(e);
+                    }
                 }
             }
         });
@@ -147,4 +149,4 @@ private org.eclipse.jkube.kit.config.resource.ConfigMap getConfigMapFromXmlConfi
         return null;
     }
 
-}
\ No newline at end of file
+}