I think you need to be explicitly testing for nil here; otherwise any falsey value would send you down the new code path, and I don't *think* that's what we want.