Attachment move was not feature complete.  Improve robustness of the code.