am 4692599c: am 44db990d: Fix bug 2950316.  Check return values.

Merge commit '4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3'

* commit '4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3':
  Fix bug 2950316.  Check return values.