tree e5b4b312ed5a6e7446d6feb17ef7d22cbaf36277
parent a3739cd552cf7dc255c04a95e8d5d7b299ba2138
author Marc Blank <mblank@google.com> 1267569468 -0800
committer Marc Blank <mblank@google.com> 1267570451 -0800

Fix #2478711

* We needed to check that clientId wasn't null before sending it back
  to the server
* Exceptions don't have a clientId

Bug: 2478711
Change-Id: Ic0d42bb699605a7bb77535b050a4d03b4b6b8b09