Fix bug - has moved flag was not reset if exception