Updated error handling to avoid problems on rackspace