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

* commit '36e0b0ef63e0ed81f103cec1c8467fa515eb4a2e':
  Catch generic exception to avoid crash.

Change-Id: I8c822b1ad9207575a085a2f3d6511cf4481f58e3