Add check on Geometry column