diff --git a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java b/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
index d2fc56e7..2eb13f7c 100644
--- a/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
+++ b/spring-amqp-core/src/main/java/org/springframework/amqp/core/MessageProperties.java
@@ -165,11 +165,11 @@ public class MessageProperties {
 	}
 
 	public void setReplyToAddress(Address replyTo) {
-		this.replyTo = replyTo.toString();
+		this.replyTo = (replyTo != null) ? replyTo.toString() : null;
 	}
 
 	public Address getReplyToAddress() {
-		return this.replyTo == null ? null : new Address(this.replyTo);
+		return (this.replyTo != null) ? new Address(this.replyTo) : null;
 	}
 
 	public void setContentType(String contentType) {