Small improvements in error parsing