Added a check for client_id in the manifest.