Better null fix
Merge branch 'master' of github.com:openfl/openfl-native