Update error handling for mapInfraActiveRequestToRequest