Merge "Quit SapServerHandler safely avoid failure"