abort execution on failure

Change-Id: I2bcb129355d1495772bde89ca935c5de3c4dce37