Added None check