am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit 'ce73af077199122e0e5a80b019f949d0f181410f':
  DO NOT MERGE Fail more gracefully on allocation failure