Improved handling of subrequest errors