Fixed recursion issue in ExManager/EMS client