Added missing handeling for bad/timing out web requests, etc.