Fix not calling callbacks if there's disconenct error