More work on the new execution model.
Protect against nulls.