Extra checking - avoid nulls again