am 55b65111: am 4ffc2eb9: Fix bug 2950316.  Check return values.

Merge commit '55b6511164e38173629029fbdd2be1b604f5a6e0'

* commit '55b6511164e38173629029fbdd2be1b604f5a6e0':
  Fix bug 2950316.  Check return values.