Another NPE fix.