I hope this does not break anything downstream, but it is good to get that logic out of there and rely on the actual, robust checks.