diff --git a/bridge_master.py b/bridge_master.py
index 7a09270..9e47aeb 100644
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -1421,8 +1421,8 @@ class routerOBP(OPENBRIDGE):
             
             #This allow careful daisychaining to reach a DATA_GATEWAY
             #Send UNIT data to data gateway
-            if CONFIG['GLOBAL']['DATA_GATEWAY'] and CONFIG['GLOBAL']['DATA_GATEWAY'] in systems \
-                and CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] == OPENBRIDGE:
+            if CONFIG['GLOBAL']['DATA_GATEWAY'] and (CONFIG['GLOBAL']['DATA_GATEWAY'] in systems) \
+                and CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] == 'OPENBRIDGE':
                     #Clear the TS bit -- all OpenBridge streams are effectively on TS1
                     _tmp_bits = _bits & ~(1 << 7)
                     #Assemble transmit HBP packet header
@@ -1434,11 +1434,12 @@ class routerOBP(OPENBRIDGE):
                         systems[system]._report.send_bridgeEvent('UNIT DATA,START,TX,{},{},{},{},{},{}'.format(system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), 1, _int_dst_id).encode(encoding='utf-8', errors='ignore'))
             else:
                 if not CONFIG['GLOBAL']['DATA_GATEWAY']:
-                    logger.info('(%s) UNIT Data not Bridged - no DATA_GATEWAY: %s DST_ID: %s',self._system,_int_dst_id)
-                else:
-                    logger.info('(%s) UNIT Data not Bridged - Problem with DATA_GATEWAY: %s DST_ID: %s',self._system,_int_dst_id)
-
-            
+                    logger.info('(%s) UNIT Data not Bridged - no DATA_GATEWAY: %s, DST_ID: %s',self._system,_int_dst_id)
+                elif CONFIG['GLOBAL']['DATA_GATEWAY'] not in systems:
+                    logger.warning('(%s) UNIT Data not Bridged - DATA_GATEWAY: %s not valid. DST_ID: %s',self._system, CONFIG['GLOBAL']['DATA_GATEWAY'],_int_dst_id)
+                elif CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] != 'OPENBRIDGE':
+                    logger.warning('(%s) UNIT Data not Bridged - DATA_GATEWAY: %s not OPENBRIDGE. DST_ID: %s',self._system, CONFIG['GLOBAL']['DATA_GATEWAY'],_int_dst_id)
+                    
         if _call_type == 'group' or _call_type == 'vcsbk':
             # Is this a new call stream?
             if (_stream_id not in self.STATUS):
@@ -1903,7 +1904,7 @@ class routerHBP(HBSYSTEM):
             
             #Send UNIT data to data gateway
             if CONFIG['GLOBAL']['DATA_GATEWAY'] and (CONFIG['GLOBAL']['DATA_GATEWAY'] in systems) \
-                and CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] == OPENBRIDGE:
+                and CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] == 'OPENBRIDGE':
                     #Clear the TS bit -- all OpenBridge streams are effectively on TS1
                     _tmp_bits = _bits & ~(1 << 7)
                     #Assemble transmit HBP packet header
@@ -1915,9 +1916,11 @@ class routerHBP(HBSYSTEM):
                         systems[system]._report.send_bridgeEvent('UNIT DATA,START,TX,{},{},{},{},{},{}'.format(system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), 1, _int_dst_id).encode(encoding='utf-8', errors='ignore'))
             else:
                 if not CONFIG['GLOBAL']['DATA_GATEWAY']:
-                    logger.info('(%s) UNIT Data not Bridged - no DATA_GATEWAY: %s DST_ID: %s',self._system,_int_dst_id)
-                else:
-                    logger.info('(%s) UNIT Data not Bridged - Problem with DATA_GATEWAY: %s DST_ID: %s',self._system, CONFIG['GLOBAL']['DATA_GATEWAY'],_int_dst_id)
+                    logger.info('(%s) UNIT Data not Bridged - no DATA_GATEWAY: %s, DST_ID: %s',self._system,_int_dst_id)
+                elif CONFIG['GLOBAL']['DATA_GATEWAY'] not in systems:
+                    logger.warning('(%s) UNIT Data not Bridged - DATA_GATEWAY: %s not valid. DST_ID: %s',self._system, CONFIG['GLOBAL']['DATA_GATEWAY'],_int_dst_id)
+                elif CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] != 'OPENBRIDGE':
+                    logger.warning('(%s) UNIT Data not Bridged - DATA_GATEWAY: %s not OPENBRIDGE. DST_ID: %s',self._system, CONFIG['GLOBAL']['DATA_GATEWAY'],_int_dst_id)