Check for empty string as well