These nilchecks are a good addition, however they seem outside the scope of this PR.