Revert "Reset location on error"

This reverts commit 7b2f091c637cec6aa26f7a1f5f98773d2a0d79f6.