Improves null management