Fix for NPE.