Handler base move error repair