Handle null geometry, registration issue