am 169ae05f: Merge change 23439 into eclair

Merge commit '169ae05f9f5cce400dd936e2a31676b80d84b862' into eclair-plus-aosp

* commit '169ae05f9f5cce400dd936e2a31676b80d84b862':
  if exception getMessage() is null, don't add it to the error