Comment 9 for bug 671538

Looks good. As discussed, I changed it from copy+delete to rename.

I also named the error 'error' rather than 'e', please try to use words as names where it makes sense.