diff --git a/sscsm.lua b/sscsm.lua
index 2796460..de20fe6 100644
--- a/sscsm.lua
+++ b/sscsm.lua
@@ -240,6 +240,6 @@ end)
 
 -- Update the waypoint list
 sscsm.register_on_com_receive('advmarkers:update', function(msg)
-    data = msg
+    data = msg or {}
     loaded = true
 end)