As stated in the other pull request, restore the null checks.