add request back from context and fix error handling