Add another error catch for specificity
Update tests to handle updated API