diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java
index 95e18a27..288ccea0 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java
@@ -17,7 +17,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Properties;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.logging.Log;
@@ -265,12 +264,8 @@ public class RabbitAdmin implements AmqpAdmin, ApplicationContextAware, Initiali
 					return props;
 				}
 				catch (IllegalArgumentException e) {
-					try {
-						if (channel instanceof ChannelProxy) {
-							((ChannelProxy) channel).getTargetChannel().close();
-						}
-					}
-					catch (TimeoutException e1) {
+					if (channel instanceof ChannelProxy) {
+						((ChannelProxy) channel).getTargetChannel().close();
 					}
 					return null;
 				}
@@ -458,17 +453,13 @@ public class RabbitAdmin implements AmqpAdmin, ApplicationContextAware, Initiali
 				}
 				try {
 					try {
-						DeclareOk declareOk = channel.queueDeclare(queue.getName(), queue.isDurable(), queue.isExclusive(), queue.isAutoDelete(),
-								queue.getArguments());
+						DeclareOk declareOk = channel.queueDeclare(queue.getName(), queue.isDurable(),
+								queue.isExclusive(), queue.isAutoDelete(), queue.getArguments());
 						declareOks[i] = declareOk;
 					}
 					catch (IllegalArgumentException e) {
-						try {
-							if (channel instanceof ChannelProxy) {
-								((ChannelProxy) channel).getTargetChannel().close();
-							}
-						}
-						catch (TimeoutException e1) {
+						if (channel instanceof ChannelProxy) {
+							((ChannelProxy) channel).getTargetChannel().close();
 						}
 						throw new IOException(e);
 					}
@@ -549,7 +540,8 @@ public class RabbitAdmin implements AmqpAdmin, ApplicationContextAware, Initiali
 	private boolean isDeclaringImplicitQueueBinding(Binding binding) {
 		if (isImplicitQueueBinding(binding)) {
 			if (logger.isDebugEnabled()) {
-				logger.debug("The default exchange is implicitly bound to every queue, with a routing key equal to the queue name.");
+				logger.debug("The default exchange is implicitly bound to every queue, " +
+						"with a routing key equal to the queue name.");
 			}
 			return true;
 		}
@@ -569,4 +561,5 @@ public class RabbitAdmin implements AmqpAdmin, ApplicationContextAware, Initiali
 	private boolean isImplicitQueueBinding(Binding binding) {
 		return isDefaultExchange(binding.getExchange()) && binding.getDestination().equals(binding.getRoutingKey());
 	}
+
 }
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java
index aca63232..a6c480d9 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/BlockingQueueConsumer.java
@@ -529,12 +529,8 @@ public class BlockingQueueConsumer {
 					this.channel.queueDeclarePassive(queueName);
 				}
 				catch (IllegalArgumentException e) {
-					try {
-						if (this.channel instanceof ChannelProxy) {
-							((ChannelProxy) this.channel).getTargetChannel().close();
-						}
-					}
-					catch (TimeoutException e1) {
+					if (this.channel instanceof ChannelProxy) {
+						((ChannelProxy) this.channel).getTargetChannel().close();
 					}
 					throw new FatalListenerStartupException("Illegal Argument on Queue Declaration", e);
 				}