Removed NPE
Using OldIO