Fix failing relationship updates with other errors

This fixes the problem, but causes a load of unrelated test failures. @wycats does this approach looks sensible or am I barking up the wrong tree?