I agree, we can avoid the null check. Will change it.