Start fixing up error output