diff --git a/daemon/core/corehandlers.py b/daemon/core/corehandlers.py
index 90113693..ecd4f348 100644
--- a/daemon/core/corehandlers.py
+++ b/daemon/core/corehandlers.py
@@ -22,7 +22,7 @@ from core.data import FileData
 from core.emulator.emudata import InterfaceData
 from core.emulator.emudata import LinkOptions
 from core.emulator.emudata import NodeOptions
-from core.enumerations import ConfigDataTypes, ExceptionLevels
+from core.enumerations import ConfigDataTypes
 from core.enumerations import ConfigFlags
 from core.enumerations import ConfigTlvs
 from core.enumerations import EventTlvs
@@ -645,11 +645,16 @@ class CoreHandler(SocketServer.BaseRequestHandler):
             y=message.get_tlv(NodeTlvs.Y_POSITION.value)
         )
 
-        node_options.set_location(
-            lat=message.get_tlv(NodeTlvs.LATITUDE.value),
-            lon=message.get_tlv(NodeTlvs.LONGITUDE.value),
-            alt=message.get_tlv(NodeTlvs.ALTITUDE.value)
-        )
+        lat = message.get_tlv(NodeTlvs.LATITUDE.value)
+        if lat is not None:
+            lat = float(lat)
+        lon = message.get_tlv(NodeTlvs.LONGITUDE.value)
+        if lon is not None:
+            lon = float(lon)
+        alt = message.get_tlv(NodeTlvs.ALTITUDE.value)
+        if alt is not None:
+            alt = float(alt)
+        node_options.set_location(lat=lat, lon=lon, alt=alt)
 
         node_options.icon = message.get_tlv(NodeTlvs.ICON.value)
         node_options.canvas = message.get_tlv(NodeTlvs.CANVAS.value)
diff --git a/daemon/core/emulator/coreemu.py b/daemon/core/emulator/coreemu.py
index e0327ed1..16173cf7 100644
--- a/daemon/core/emulator/coreemu.py
+++ b/daemon/core/emulator/coreemu.py
@@ -543,7 +543,7 @@ class EmuSession(Session):
             # set node as updated successfully
             result = True
         except KeyError:
-            logger.error("failure to update node that does not exist: %s", node_options.id)
+            logger.error("failure to update node that does not exist: %s", node_id)
 
         return result