Fix: only convert null/undefined values