Yes and yes, I'll change to call abort() here