Fix up null handling.