Better handling of malformed bus names