Fixing error message strings (and logic, for table view).