One more undefined/null fix