Fix NPE.
Another NPE fix.