diff --git a/src/com/serotonin/modbus4j/sero/messaging/MessageControl.java b/src/com/serotonin/modbus4j/sero/messaging/MessageControl.java
index 4ec5d89..edaac11 100644
--- a/src/com/serotonin/modbus4j/sero/messaging/MessageControl.java
+++ b/src/com/serotonin/modbus4j/sero/messaging/MessageControl.java
@@ -52,6 +52,9 @@ public class MessageControl implements DataConsumer {
      */
     public void start(Transport transport, MessageParser messageParser, RequestHandler handler,
             WaitingRoomKeyFactory waitingRoomKeyFactory) throws IOException {
+        if (transport == null) {
+            throw new IllegalArgumentException("transport cannot be null");
+        }
         this.transport = transport;
         this.messageParser = messageParser;
         this.requestHandler = handler;
@@ -64,7 +67,9 @@ public void start(Transport transport, MessageParser messageParser, RequestHandl
      * <p>close.</p>
      */
     public void close() {
-        transport.removeConsumer();
+        if (transport != null) {
+            transport.removeConsumer();
+        }
     }
 
     /**