author added, NPE resolved