This changes our handling of invalid service types that the