Fixed exit on abort