Do not include the result value in the exception message to avoid data exposure. Improve data flow to avoid superfluous null checks. See #2290. Original Pull Request: #2291.