Add null handling.