Make server move handler more robust.