FS-6287 this should either prevent the problem or spell out what is causing it. please test
FS-6168 --resolve