diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java
index 9ebce05a6d..7645811022 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java
@@ -271,7 +271,7 @@ public abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewa
 		this.requestMapping = requestMapping;
 	}
 
-	public RequestMapping getRequestMapping() {
+	public final RequestMapping getRequestMapping() {
 		return requestMapping;
 	}
 
@@ -521,7 +521,6 @@ public abstract class HttpRequestHandlingEndpointSupport extends MessagingGatewa
 	/**
 	 * Converts a servlet request's parameterMap to a {@link MultiValueMap}.
 	 */
-	@SuppressWarnings("rawtypes")
 	private MultiValueMap<String, String> convertParameterMap(Map<String, String[]> parameterMap) {
 		MultiValueMap<String, String> convertedMap = new LinkedMultiValueMap<String, String>(parameterMap.size());
 		for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java
index e46f7e471c..5dcdec0ef0 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java
@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -96,7 +97,9 @@ public final class IntegrationRequestMappingHandlerMapping extends RequestMappin
 			handler = this.getApplicationContext().getBean((String) handler);
 		}
 		RequestMappingInfo mapping = this.getMappingForEndpoint((HttpRequestHandlingEndpointSupport) handler);
-		this.registerHandlerMethod(handler, HANDLE_REQUEST_METHOD, mapping);
+		if (mapping != null) {
+			this.registerHandlerMethod(handler, HANDLE_REQUEST_METHOD, mapping);
+		}
 	}
 
 	/**
@@ -107,6 +110,10 @@ public final class IntegrationRequestMappingHandlerMapping extends RequestMappin
 	private RequestMappingInfo getMappingForEndpoint(HttpRequestHandlingEndpointSupport endpoint) {
 		final RequestMapping requestMapping = endpoint.getRequestMapping();
 
+		if (ObjectUtils.isEmpty(requestMapping.getPathPatterns())) {
+			return null;
+		}
+
 		org.springframework.web.bind.annotation.RequestMapping requestMappingAnnotation =
 				new org.springframework.web.bind.annotation.RequestMapping() {
 					public String[] value() {