3.0 fix notnull

Fixes #3836