Fix unhandled allocation failure
am: acb12378f9

Change-Id: I2091c4b1bcf5f39db5f599b218da211d2499f0cb