[FIX] Check for NPE.