Probable fix for NPE on new installations.