diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AbstractAmqpOutboundEndpoint.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AbstractAmqpOutboundEndpoint.java
index c4dad65fa6..4f5783b745 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AbstractAmqpOutboundEndpoint.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AbstractAmqpOutboundEndpoint.java
@@ -310,14 +310,14 @@ public abstract class AbstractAmqpOutboundEndpoint extends AbstractReplyProducin
 
 	protected MessageChannel getConfirmAckChannel() {
 		if (this.confirmAckChannel == null && this.confirmAckChannelName != null) {
-			this.confirmAckChannel = getChannelResolver().resolveDestination(confirmAckChannelName);
+			this.confirmAckChannel = getChannelResolver().resolveDestination(this.confirmAckChannelName);
 		}
 		return this.confirmAckChannel;
 	}
 
 	protected MessageChannel getConfirmNackChannel() {
 		if (this.confirmNackChannel == null && this.confirmNackChannelName != null) {
-			this.confirmNackChannel = getChannelResolver().resolveDestination(confirmNackChannelName);
+			this.confirmNackChannel = getChannelResolver().resolveDestination(this.confirmNackChannelName);
 		}
 		return this.confirmNackChannel;
 	}
diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java
index 0fcc582569..008df3e434 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/AmqpMessageHeaderErrorMessageStrategy.java
@@ -43,15 +43,18 @@ public class AmqpMessageHeaderErrorMessageStrategy implements ErrorMessageStrate
 	public static final String AMQP_RAW_MESSAGE = AmqpHeaders.PREFIX + "raw_message";
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public ErrorMessage buildErrorMessage(Throwable throwable, AttributeAccessor context) {
-		Object inputMessage =  context == null ? null
+		Object inputMessage = context == null
+				? null
 				: context.getAttribute(ErrorMessageUtils.INPUT_MESSAGE_CONTEXT_KEY);
-		Map<String, Object> headers = Collections.singletonMap(
-				AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE,
-				context.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE));
+		Map<String, Object> headers = context == null
+				? new HashMap<String, Object>()
+				: Collections.singletonMap(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE,
+						context.getAttribute(AmqpMessageHeaderErrorMessageStrategy.AMQP_RAW_MESSAGE));
+
 		return inputMessage instanceof Message
-				? new org.springframework.integration.message.EnhancedErrorMessage(throwable, headers,
-						(Message<?>) inputMessage)
+				? new org.springframework.integration.message.EnhancedErrorMessage(throwable, headers, (Message<?>) inputMessage)
 				: new ErrorMessage(throwable, headers);
 	}