Fix findbugs null pointer exception warnings

The @CheckForNull annotation clarified some of the places where a null
pointer check is a useful check.  This resolves those warnings
Correct an exception message
Merge branch 'master-findbugs-fix-NPE-warnings' into master-work