Fixed error tracking