Add null-safe getter