Added abort handling to slave