added error flags, removed multiple deferred contexts