Fixing NPE!