ENH: Allow None

Ready for review/merge