diff --git a/processor/src/main/java/org/jboss/logging/processor/apt/MessageMethodBuilder.java b/processor/src/main/java/org/jboss/logging/processor/apt/MessageMethodBuilder.java
index 443e50c..6195c0c 100644
--- a/processor/src/main/java/org/jboss/logging/processor/apt/MessageMethodBuilder.java
+++ b/processor/src/main/java/org/jboss/logging/processor/apt/MessageMethodBuilder.java
@@ -370,7 +370,8 @@ public Set<Parameter> parameters() {
         @Override
         public Set<Parameter> parametersAnnotatedWith(final Class<? extends Annotation> annotation) {
             final TypeElement type = ElementHelper.toTypeElement(elements, annotation);
-            return parameters.containsKey(type.asType()) ? Collections.unmodifiableSet(parameters.get(type.asType()))
+            return (type != null && parameters.containsKey(type.asType()))
+                    ? Collections.unmodifiableSet(parameters.get(type.asType()))
                     : Collections.emptySet();
         }