Moved sensitive data checking logic into the WebClient wrapper