Minor bug fix. string->null check