Tweak undefined/null handling