r23538: Fix for wild-card rename: We can't return directly on error, we need to