2 files changed, 5 insertions, 0 deletions
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java b/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
index 6362a6453b..cd4ae08102 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
@@ -88,6 +88,7 @@ public class MinaHandler<E> implements IoHandler
     public void exceptionCaught(IoSession ssn, Throwable e)
     {
         log.error(e, "exception caught");
+        throw new RuntimeException("IOException", e);
     }
 
     public void sessionCreated(final IoSession ssn)
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaSender.java b/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaSender.java
index c9032554fa..6906c03cb6 100644
--- a/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaSender.java
+++ b/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaSender.java
@@ -50,6 +50,10 @@ public class MinaSender implements Sender<java.nio.ByteBuffer>
     {
         synchronized (lock)
         {
+            if( session.isClosing())
+            {
+                throw new RuntimeException("Trying to write on a closed socket");
+            }
             lastWrite = session.write(ByteBuffer.wrap(buf));
         }
     }