removed abort in bad scenarios