Checking for is not None explicitly. Sorry @lucab-eyer.

And another one for @lucasb-eyer to check.