Fix for NPE on older Hadoop APIs