Fix rename regression
Merge pull request #939 from hugovk/deferred_error_regression

Fix regression