GWT-676: null geometry territory: corrections