None check added