more null fixes.