diff --git a/src/kpi_value_writer/service/KpiValueWriter.py b/src/kpi_value_writer/service/KpiValueWriter.py
index 25b8ca2e8a38091aa211e07c23062c5a666b1a94..74291bba34ff85556ffe55e2c57ad7877846dc34 100644
--- a/src/kpi_value_writer/service/KpiValueWriter.py
+++ b/src/kpi_value_writer/service/KpiValueWriter.py
@@ -55,11 +55,9 @@ class KpiValueWriter(GenericGrpcService):
             if raw_kpi is None:
                 continue
             elif raw_kpi.error():
-                if raw_kpi.error().code() == KafkaError._PARTITION_EOF:
-                    continue
-                else:
+                if raw_kpi.error().code() != KafkaError._PARTITION_EOF:
                     print("Consumer error: {}".format(raw_kpi.error()))
-                    continue
+                continue
             try:
                 kpi_value = json.loads(raw_kpi.value().decode('utf-8'))
                 LOGGER.info("Received KPI : {:}".format(kpi_value))
@@ -79,5 +77,5 @@ class KpiValueWriter(GenericGrpcService):
                 metric_writer.create_and_expose_cooked_kpi(kpi_descriptor_object, kpi_value)
             else:
                 LOGGER.info("No KPI Descriptor found in Database for Kpi ID: {:}".format(kpi_id))
-        except Exception as e:
-            LOGGER.info("Unable to get KpiDescriptor. Error: {:}".format(e))
+        except:
+            LOGGER.exception("Unable to get KpiDescriptor")
diff --git a/src/telemetry/backend/Dockerfile b/src/telemetry/backend/Dockerfile
index 7448f1ebc60015e13499a7a702750c75214494bc..81f8bba4be753c3a33847dab6e6c0244c0a4b033 100644
--- a/src/telemetry/backend/Dockerfile
+++ b/src/telemetry/backend/Dockerfile
@@ -64,6 +64,8 @@ RUN python3 -m pip install -r requirements.txt
 WORKDIR /var/teraflow
 COPY src/context/__init__.py context/__init__.py
 COPY src/context/client/. context/client/
+COPY src/device/__init__.py device/__init__.py
+COPY src/device/client/. device/client/
 COPY src/kpi_manager/client/. kpi_manager/client/
 COPY src/kpi_manager/__init__.py kpi_manager/__init__.py
 COPY src/telemetry/__init__.py telemetry/__init__.py