Merge "Revert "Switch fatalError to NPE""