Although I can't reproduce reliably, I am hopeful that this will resolve a lot of the errors such as #557.