Fix unprocessed NPE