Merge "Catch generic exception to avoid crash." into nyc-dev
am: 0ac7ec1

* commit '0ac7ec193e7a0a1750be0ac07ed31bfcaf4bb00a':
  Catch generic exception to avoid crash.

Change-Id: I7490d3a3b835430eb2eda9aa2b0b850c331b491d