Sri | Fixing NPE