Bail on host with not metadata before adding/removing

peer review input