removed unnecessary NPE catch