--- a/src/devices/mesh/mesh-point-device.cc	Tue Oct 13 10:23:21 2009 -0700
+++ b/src/devices/mesh/mesh-point-device.cc	Tue Oct 13 12:51:46 2009 -0700
@@ -59,6 +59,9 @@
 MeshPointDevice::~MeshPointDevice ()
 {
   NS_LOG_FUNCTION_NOARGS ();
+  m_node = 0;
+  m_channel = 0;
+  m_routingProtocol = 0;
 }
 
 void
@@ -70,7 +73,6 @@
       *iter = 0;
     }
   m_ifaces.clear ();
-  m_node = 0;
   NetDevice::DoDispose ();
 
 }