handle null-ish values better