Merge "Switch fatalError to NPE"