diff --git a/src/cprotocol.cpp b/src/cprotocol.cpp
index a5d2adb..7fd4967 100644
--- a/src/cprotocol.cpp
+++ b/src/cprotocol.cpp
@@ -177,9 +177,12 @@ CPacketStream *CProtocol::GetStream(uint16 uiStreamId, const CIp *Ip)
         if ( m_Streams[i]->GetStreamId() == uiStreamId )
         {
             // if Ip not NULL, also check if IP match
-            if ( (Ip != NULL) && (*Ip == *(m_Streams[i]->GetOwnerIp())) )
+            if ( (Ip != NULL) && (m_Streams[i]->GetOwnerIp() != NULL) )
             {
-                stream = m_Streams[i];
+                if ( *Ip == *(m_Streams[i]->GetOwnerIp()) )
+                {
+                    stream = m_Streams[i];
+                }
             }
         }
     }
diff --git a/src/main.h b/src/main.h
index d54c193..e9f627e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -49,7 +49,7 @@
 
 #define VERSION_MAJOR                   2
 #define VERSION_MINOR                   3
-#define VERSION_REVISION                2
+#define VERSION_REVISION                3
 
 // global ------------------------------------------------------