check that deferred error is
Merge branch 'fix-that-thing'