Make the correct None check