Add findbugs null check requirement