Provide better handling of None