Add more information to the output and check for errors.