added error aborting