Add additional check when for request is in kwargs