Break up the if into two ifs

This to keep the statement within reasonable margin of 'the guide' and
aid IDEs in the validity of the nullcheck