moves error propagation out of the synchronise to avoid deadlock (#1060)

[OlegDokuka]

(cherry picked from commit 6426e45619ec32acef0c6c7184020776a9063ffe)

[One line description of your change]

Motivation:

[Explain here the context, and why you're making that change. What is the problem you're trying to solve.]

Modifications:

[Describe the modifications you've done.]

Result:

[After your change, what will change.]