Fix errors when we don't have geometry or description