Fixed null-string bug