Strip whitespace and try to handle blank rows better.