More NPE fixes, 5.0.6