--- TCP.pm.orig	2006-09-04 15:04:44.000000000 +0100
+++ TCP.pm	2006-09-04 15:05:12.000000000 +0100
@@ -270,8 +270,6 @@
           $kernel->alarm_remove( delete $heap->{ctimeout_id} )
             if exists $heap->{ctimeout_id};
 
-          $kernel->alias_remove($alias) if defined $alias;
-
           if ($heap->{connected}) {
             if (defined $heap->{server}) {
               if (
@@ -286,6 +284,8 @@
           else {
             delete $heap->{server};
           }
+
+          $kernel->alias_remove($alias) if defined $alias;
         },
 
         # User supplied states.