Doh, I think the problem can be avoided with `pd.isnull`...