Remove unnecessary handling of NPE.