do not crash when new content source is encountered
improve how errors are constructed