Catch more error types