Merge pull request #568 from jkczyz/2020-03-handle-error-deadlock