Preventing more errors when move fails