Resolve null warnings: make null-strategy better analyzable. 
25 files changed