annotations - fix null geometry handling