diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Info.plist b/Alexa-Hue Bridge.indigoPlugin/Contents/Info.plist
index 2fb8531..a7ac9ae 100755
--- a/Alexa-Hue Bridge.indigoPlugin/Contents/Info.plist	
+++ b/Alexa-Hue Bridge.indigoPlugin/Contents/Info.plist	
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>3.0.18</string>
+	<string>3.0.19</string>
 	<key>ServerApiVersion</key>
 	<string>2.0</string>
 	<key>IwsApiVersion</key>
diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Resources/icon.png b/Alexa-Hue Bridge.indigoPlugin/Contents/Resources/icon.png
index a49742c..fc9fed4 100644
Binary files a/Alexa-Hue Bridge.indigoPlugin/Contents/Resources/icon.png and b/Alexa-Hue Bridge.indigoPlugin/Contents/Resources/icon.png differ
diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/PluginConfig.xml b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/PluginConfig.xml
index f09a131..9c7af14 100755
--- a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
+++ b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
@@ -21,7 +21,7 @@
 
     <Field id="separator-2" type="separator" visibleBindingValue="true"/> 
 
-     <Field type="checkbox" id="showDiscoveryInEventLog" default="true" alwaysUseInDialogHeightCalc="true">
+     <Field id="showDiscoveryInEventLog" type="checkbox" default="true" alwaysUseInDialogHeightCalc="true">
         <Label>Log Discovery:</Label>
         <Description>Log Alexa discovery requests in Event Log.</Description>
     </Field>
diff --git a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/plugin.py b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/plugin.py
index d464817..711eeb0 100755
--- a/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/Alexa-Hue Bridge.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -166,6 +166,9 @@ def getPrefsConfigUiValues(self):
         else:
             prefsConfigUiValues["networkCheckURL"] = NETWORK_AVAILABLE_CHECK_REMOTE_SERVER
 
+        if "showDiscoveryInEventLog" not in prefsConfigUiValues:
+            prefsConfigUiValues["showDiscoveryInEventLog"] = True
+
         return prefsConfigUiValues
 
     def validatePrefsConfigUi(self, valuesDict):
@@ -421,7 +424,7 @@ def deviceStartComm(self, ahbDev):
                 self.globals['portList'].append(port)
 
             try:
-                if int(ahbDev.address) != int(port):
+                if ahbDev.address is None or ahbDev.address == '' or int(ahbDev.address) != int(port):
                     port_changed = True
             except:
                 self.generalLogger.error("Alexa-Hue Bridge '{}' at address {} either has an invalid address or invalid port {} - specify in Device Config".format(ahbDev.name, ahbDev.address, port))