Moved the delaying of the response to the main-flow. That way it can be combined with forced error responses.