diff --git a/voltha/adapters/openolt/openolt_device.py b/voltha/adapters/openolt/openolt_device.py
index 3785598..d16dbca 100644
--- a/voltha/adapters/openolt/openolt_device.py
+++ b/voltha/adapters/openolt/openolt_device.py
@@ -139,7 +139,7 @@
         if dpid is None: dpid = self.dpid
         if serial_number is None: serial_number = self.serial_number
 
-        if dpid == None:
+        if dpid == None or dpid == '':
             uri = self.host_and_port.split(":")[0]
             try:
                 socket.inet_pton(socket.AF_INET, uri)
@@ -148,6 +148,9 @@
                 # this is not an IP
                 dpid = self.stringToMacAddr(uri)
 
+        if serial_number == None or serial_number == '':
+            serial_number = self.host_and_port
+
         self.log.info('creating-openolt-logical-device', dp_id=dpid, serial_number=serial_number)
 
         mfr_desc = device_info.vendor