improved error analysing regarding source class