Sri | Still fixing NPE