Add assert to require client_id defined