better handling of failed requests

1 job for aziz/photo_fix in 2 minutes and 32 seconds (queued for 7 seconds)