diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
index 29fce56..26ab9e4 100755
--- a/code/ddns-lambda.py
+++ b/code/ddns-lambda.py
@@ -73,7 +73,7 @@
 LOGGER = logging.getLogger()
 account_id = None
 region = None
-VERSION = '1.2.0b51'
+VERSION = '1.2.0b52'
 
 # Read Env variables
 DEBUG_LOG_LEVEL = os.environ.get('DebugLogLevel', 'INFO')
@@ -629,45 +629,45 @@ def lambda_handler(
     default_hostname = '-'.join(['ip'] + private_ip.split('.'))
     if tag_data['option_zone'].valid:
         if tag_data['option_name'].valid:
-            LOGGER.info("instance: %s, using tag_option.zone hostname %s and tag_option.zone zone %s.",
+            LOGGER.info("1.1 instance: %s, using tag_option.zone hostname %s and tag_option.zone zone %s.",
                         instance_id, tag_data['option_name'].hostname, tag_data['option_zone'].zonename)
             f_hostname = tag_data['option_name'].hostname
             f_zonename = tag_data['option_zone'].zonename
         elif tag_data['name'].valid:
-            LOGGER.info("instance: %s, using tag_key.Name hostname %s and tag_option.zone zone %s.",
+            LOGGER.info("1.2 instance: %s, using tag_key.Name hostname %s and tag_option.zone zone %s.",
                         instance_id, tag_data['name'].hostname, tag_data['option_zone'].zonename)
             f_hostname = tag_data['name'].hostname
             f_zonename = tag_data['option_zone'].zonename
         else:
-            LOGGER.info("instance: %s, using default ip-address %s for hostname and tag_option.zone zone %s.",
+            LOGGER.info("1.3 instance: %s, using default ip-address %s for hostname and tag_option.zone zone %s.",
                         instance_id, default_hostname, tag_data['option_zone'].zonename)
             f_hostname = default_hostname
             f_zonename = tag_data['option_zone'].zonename
 
     else:
         if tag_data['option_name'].valid:
-            LOGGER.info("instance: %s, using tag_option.name hostname %s and and tag_option.name zone %s.",
+            LOGGER.info("2.1 instance: %s, using tag_option.name hostname %s and and tag_option.name zone %s.",
                         instance_id, tag_data['option_name'].hostname, tag_data['option_name'].zonename)
             f_hostname = tag_data['option_name'].hostname
             f_zonename = tag_data['option_name'].zonename
-        elif not tag_data['option_name'].valid and tag_data['option_name'].hostname != '' and tag_data['dhcp_options'].valid:
-            LOGGER.info("instance: %s, using tag_option.name hostname %s and and dhcp_options zone %s.",
+        elif not tag_data['option_name'].valid and len(tag_data['option_name'].hostname) > 0 and tag_data['dhcp_options'].valid:
+            LOGGER.info("2.2 instance: %s, using tag_option.name hostname %s and and dhcp_options zone %s.",
                         instance_id, tag_data['option_name'].hostname, tag_data['dhcp_options'].zonename)
             f_hostname = tag_data['option_name'].hostname
             f_zonename = tag_data['dhcp_options'].zonename
         elif tag_data['name'].valid:
-            LOGGER.info("instance: %s, using tag_key.Name hostname %s and tag_key.Name zone %s.",
+            LOGGER.info("2.3 instance: %s, using tag_key.Name hostname %s and tag_key.Name zone %s.",
                         instance_id, tag_data['name'].hostname, tag_data['name'].zonename)
             f_hostname = tag_data['name'].hostname
             f_zonename = tag_data['name'].zonename
         elif not tag_data['name'].valid and tag_data['dhcp_options'].valid:
-            LOGGER.info("instance: %s, using default ip-addresss hostname %s and dhcp_options zone %s.",
+            LOGGER.info("2.4 instance: %s, using default ip-addresss hostname %s and dhcp_options zone %s.",
                         instance_id, default_hostname, tag_data['dhcp_options'].zonename)
             f_hostname = default_hostname
             f_zonename = tag_data['dhcp_options'].zonename
 #        elif not tag_data['name'].valid and not tag_data['dhcp_options'].valid:
         else:
-            LOGGER.info("instance: %s, no valid hostname or zone found", instance_id)
+            LOGGER.info("3.1 instance: %s, no valid hostname or zone found", instance_id)
             f_hostname = None
             f_zonename = None
             LOGGER.error(
@@ -677,7 +677,7 @@ def lambda_handler(
             return caller_response
 # note this will not continue and set a cname
 
-    final_private_hostname = f_hostname
+    final_private_hostname = f_hostname if len(f_hostname) > 0 else default_hostname
     final_hosted_zone_name = f_zonename
     final_private_dns_name = '.'.join([f_hostname, f_zonename])
 
diff --git a/code/ddns-lambda.zip b/code/ddns-lambda.zip
index f5d77dc..5747022 100644
Binary files a/code/ddns-lambda.zip and b/code/ddns-lambda.zip differ