diff --git a/DGIdGateway/DGIdGateway.cpp b/DGIdGateway/DGIdGateway.cpp
index 1175488..bd3ebf5 100644
--- a/DGIdGateway/DGIdGateway.cpp
+++ b/DGIdGateway/DGIdGateway.cpp
@@ -546,7 +546,7 @@ int CDGIdGateway::run()
 			nPips = 0U;
 		}
 
-		if (dgIdNetwork[currentDGId] != NULL) {
+		if (currentDGId != UNSET_DGID && dgIdNetwork[currentDGId] != NULL) {
 			DGID_STATUS netState = dgIdNetwork[currentDGId]->getStatus();
 			bool statc = dgIdNetwork[currentDGId]->m_static;
 			if (fromRF && state != DS_LINKED && netState != DS_LINKED && statc)
diff --git a/DGIdGateway/Version.h b/DGIdGateway/Version.h
index 8d5b383..c7678fe 100644
--- a/DGIdGateway/Version.h
+++ b/DGIdGateway/Version.h
@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define	VERSION_H
 
-const char* VERSION = "20201101";
+const char* VERSION = "20201107";
 
 #endif