Correct error message for invalid catalog name
Fix test