Better error highlighting. Again