diff --git a/VERSION b/VERSION
index cc6c9a4..a2a044c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.5
+2.3.6-dev
diff --git a/pyvoltha/adapters/kafka/adapter_request_facade.py b/pyvoltha/adapters/kafka/adapter_request_facade.py
index b27e740..b2356ba 100644
--- a/pyvoltha/adapters/kafka/adapter_request_facade.py
+++ b/pyvoltha/adapters/kafka/adapter_request_facade.py
@@ -130,7 +130,13 @@
         return True, self.adapter.get_ofp_port_info(d, p.val)
 
     def reconcile_device(self, device, **kwargs):
-        return self.adapter.reconcile_device(device)
+        d = Device()
+        if device:
+            device.Unpack(d)
+            return True, self.adapter.reconcile_device(d)
+        else:
+            return False, Error(code=ErrorCode.INVALID_PARAMETERS,
+                                reason="device-invalid")
 
     def abandon_device(self, device, **kwargs):
         return self.adapter.abandon_device(device)