Hotfix: Undefined variables are ... undefined! (not null)