Replace nulls with Option values