Onkar: changes for fixing NPE