Minor null handling tweaks.