diff --git a/src/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java b/src/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java
index 8cf8fa6..813254b 100644
--- a/src/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java
+++ b/src/com/serotonin/modbus4j/sero/messaging/InputStreamListener.java
@@ -105,7 +105,7 @@ public void run() {
                 }
                 catch (IOException e) {
                     consumer.handleIOException(e);
-                    if (StringUtils.equals(e.getMessage(), "Stream closed."))
+                    if (StringUtils.equals(e.getMessage(), "Stream Closed"))
                         break;
                     if (StringUtils.contains(e.getMessage(), "nativeavailable"))
                         break;
diff --git a/src/com/serotonin/modbus4j/sero/messaging/StreamTransport.java b/src/com/serotonin/modbus4j/sero/messaging/StreamTransport.java
index d496b39..16725b5 100644
--- a/src/com/serotonin/modbus4j/sero/messaging/StreamTransport.java
+++ b/src/com/serotonin/modbus4j/sero/messaging/StreamTransport.java
@@ -72,6 +72,7 @@ public void setConsumer(DataConsumer consumer) {
      * <p>removeConsumer.</p>
      */
     public void removeConsumer() {
+        if (listener == null) return;
         listener.stop();
         listener = null;
     }