This has been changed into a null check.