Better error handling

1 job for 33-400-error-handling in 4 minutes and 49 seconds (queued for 3 seconds)