throw on non-found vdc and catalog names
formatting tidy and clarity add