I agree, my solution feels a little clumsy. It's double checking, which is not needed most of the time (only on bootstrapping).