Fixed check of null string