handling None as well