Option failure handling

Change-Id: If58fb1c4533bdff9d0c0cd9efb92119764c6ba19