3.0 fix notnull

Fixes #3836
Extra space after "or"  :trollface: