Remove unnessesary condition to record errors