Made error messages for bad row format in  slightly more consistent.