Fixed FindBugs warnings in Client & Server