Try to fail fast when not able to clean up

Signed-off-by: dmitriy kalinin <dmitriy@pivotallabs.com>