diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java
index 4b12031053..92e6949eb3 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java
@@ -45,7 +45,6 @@ import org.springframework.stereotype.Indexed;
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@Documented
 @Indexed
 public @interface MessagingGateway {
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessagingGatewayRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessagingGatewayRegistrar.java
index 9980d73903..da9019fbe8 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/MessagingGatewayRegistrar.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MessagingGatewayRegistrar.java
@@ -199,7 +199,10 @@ public class MessagingGatewayRegistrar implements ImportBeanDefinitionRegistrar
 			Set<String> chain = importingClassMetadata.getMetaAnnotationTypes(ann);
 			if (chain.contains(MessagingGateway.class.getName())) {
 				for (String meta : chain) {
-					valuesHierarchy.add(importingClassMetadata.getAllAnnotationAttributes(meta));
+					MultiValueMap<String, Object> attributes = importingClassMetadata.getAllAnnotationAttributes(meta);
+					if (attributes != null) {
+						valuesHierarchy.add(attributes);
+					}
 				}
 			}
 		}