Bugfix: Re-add checks for 'undefined'

[istnv]

Argh. This was supposed to be in the prior updates. Apparently stashed but not re-applied.