Merge change 23439 into eclair

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