Logging diagnostics which demonstrate roots of the problem (break
on no names)
More tests, going to check possible fix on multiple-files run.