Tweak to null handling