Fix client side calls crashing the server.