added disconnect message for exceptions and updated tests