WIP Error formatting improving.