diff --git a/meshtastic/mesh_interface.py b/meshtastic/mesh_interface.py
index 869309b..11beb47 100644
--- a/meshtastic/mesh_interface.py
+++ b/meshtastic/mesh_interface.py
@@ -160,8 +160,8 @@ class MeshInterface:
                 if user:
                     row.update(
                         {
-                            "User": user["longName"],
-                            "AKA": user["shortName"],
+                            "User": user.get("longName", "N/A"),
+                            "AKA": user.get("shortName", "N/A"),
                             "ID": user["id"],
                         }
                     )