Revert "Switch fatalError to NPE"

Tests are still broken.

This reverts commit db56e11f9b443648d09b0b3c3fc27a783be1774c.

Change-Id: I7ed033c6bcb4bdb1e11859506c1ee73dffdad965
2 files changed