Value cannot be null crash fix!