Don't we need a test of a non-null value?  Isn't None the default?