Another huge improvement to error tracking