Clean up error messages and conditionals in reestablish handling