removed misleading comments and unnecessary NPE catch