am f79ba17d: Merge "Add a test for our NPE checks."

* commit 'f79ba17defbd9342e44ab9f3de0807054673d3c9':
  Add a test for our NPE checks.