Comment 0 for bug 1641905

In 1.2.15 the unit tests (which run at build time) fail with an error message in the atomic files test, because I picked a commit that improved the error handling a bit (a previous error now propagates into further calls).

I'll revert that for 1.2.16, as it depends on another fix, and I'm not sure I really want those two in there.