Working around nulls with options