Yes, something definitely needs to change. I'm just waiting to hear whether None should be allowed or not.