Update null check
Remove char contants