Error catching (404, etc. and timeouts) fix