Fixing NPE.