CDK-369: Update to use NullPointerException.