Change None checking to use 'is'