Added other exceptions to check for!