Change to implicit check of None value, as per comment in #38