(Client) Fix some throws