NonNilCheck improvements

I was adding some test coverage and refactoring. Noticed a need to issuing two different messages from `NonNilCheck`.