--- a/bluetooth/btstack/avctp/avctpmuxer.cpp	Wed Sep 15 13:27:26 2010 +0300
+++ b/bluetooth/btstack/avctp/avctpmuxer.cpp	Wed Oct 13 15:48:34 2010 +0300
@@ -37,10 +37,6 @@
 _LIT8(KLogComponent, LOG_COMPONENT_AVCTP);
 #endif
 
-#ifdef _DEBUG
-PANICCATEGORY("avctpmux");
-#endif
-
 using namespace SymbianAvctp;
 
 #ifdef __FLOG_ACTIVE	
@@ -939,6 +935,7 @@
 
 void CAvctpTransport::BindSecondaryChannelSap(CServProviderBase& aSAP)
 	{
+	__ASSERT_DEBUG(!iChannelSAPs[KAvctpSecondaryChannel], Panic(EObjectAlreadyExists));
 	iChannelSAPs[KAvctpSecondaryChannel] = &aSAP;
 	iChannelSAPs[KAvctpSecondaryChannel]->SetNotify(&iSecondChannelSocket);
 	}