Copy stashes in instead of renaming to avoid the annoying exception