improve down-move error handling