More graceful interruptions for move-over

Related to #40