reverted null checks from erroneous previous commit
release 2.1M5
inced version