diff -r ae47d0499bee -r c9776eadbffd commsfwsupport/commselements/nodemessages/src/nm_messages.cpp --- a/commsfwsupport/commselements/nodemessages/src/nm_messages.cpp Mon Sep 06 13:49:23 2010 +0100 +++ b/commsfwsupport/commselements/nodemessages/src/nm_messages.cpp Mon Sep 13 15:06:46 2010 +0100 @@ -52,6 +52,7 @@ { const TNodeId& nodeId = address_cast(aRecipient); //This message type operates on nodes __ASSERT_DEBUG(nodeId.Ptr(), User::Panic(KSpecAssert_ElemNodeMessMesC, 1)); + __ASSERT_ALWAYS(nodeId.Node().NodeId() == nodeId, User::Panic(KMessagesPanic, EDeceasedNodePanic)); //Address reuse protection (Ptr() may match something existing, but not necesserily the intended addresee). nodeId.Node().ReceivedL(aSender, nodeId, *this); }