diff --git a/processor/src/main/java/org/mapstruct/ap/util/SpecificCompilerWorkarounds.java b/processor/src/main/java/org/mapstruct/ap/util/SpecificCompilerWorkarounds.java
index dc62c5782..251a5f5fc 100644
--- a/processor/src/main/java/org/mapstruct/ap/util/SpecificCompilerWorkarounds.java
+++ b/processor/src/main/java/org/mapstruct/ap/util/SpecificCompilerWorkarounds.java
@@ -66,7 +66,7 @@ public class SpecificCompilerWorkarounds {
      * @jls 4.6 Type Erasure
      */
     public static TypeMirror erasure(Types types, TypeMirror t) {
-        if ( t.getKind() == TypeKind.VOID ) {
+        if ( t.getKind() == TypeKind.VOID || t.getKind() == TypeKind.NULL ) {
             return t;
         }
         else {