adding None check