Identifying the errors

Ok, could you talk to Oliver and try to avoid duplication like this?  The code needs to be coherent.