diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
index 6b10ebcc7f..823dddc6e8 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
@@ -1196,13 +1196,14 @@ public <R, S> boolean receiveAndReply(String queueName, ReceiveAndReplyCallback<
 	private <R, S> boolean doReceiveAndReply(final String queueName, final ReceiveAndReplyCallback<R, S> callback,
 			final ReplyToAddressCallback<S> replyToAddressCallback) throws AmqpException {
 
-		return execute(channel -> {
-			Message receiveMessage = receiveForReply(queueName, channel);
-			if (receiveMessage != null) {
-				return sendReply(callback, replyToAddressCallback, channel, receiveMessage);
-			}
-			return false;
-		}, obtainTargetConnectionFactory(this.receiveConnectionFactorySelectorExpression, queueName));
+		Boolean result = execute(channel -> {
+					Message receiveMessage = receiveForReply(queueName, channel);
+					if (receiveMessage != null) {
+						return sendReply(callback, replyToAddressCallback, channel, receiveMessage);
+					}
+					return false;
+				}, obtainTargetConnectionFactory(this.receiveConnectionFactorySelectorExpression, queueName));
+		return result == null ? false : result;
 	}
 
 	@Nullable
@@ -1307,7 +1308,7 @@ else if (logger.isDebugEnabled()) {
 	}
 
 	@SuppressWarnings(UNCHECKED)
-	private <R, S> Boolean sendReply(final ReceiveAndReplyCallback<R, S> callback,
+	private <R, S> boolean sendReply(final ReceiveAndReplyCallback<R, S> callback,
 			final ReplyToAddressCallback<S> replyToAddressCallback, Channel channel, Message receiveMessage)
 					throws Exception { // NOSONAR TODO change to IOException in 2.2.
 
@@ -2027,8 +2028,9 @@ private void cleanUpAfterAction(Channel channel, boolean invokeScope, RabbitReso
 		}
 	}
 
+	@Nullable
 	private <T> T invokeAction(ChannelCallback<T> action, ConnectionFactory connectionFactory, Channel channel)
-			throws Exception {
+			throws Exception { // NOSONAR see the callback
 
 		if (this.confirmsOrReturnsCapable == null) {
 			determineConfirmsReturnsCapability(connectionFactory);