Fixes #945 - handle concurrent errors/failures in the same run