Index: src/libchcore/TBasePathData.cpp
===================================================================
diff -u -N -rcb4e9d4b60d62b25ae2cf556c0642601af56c787 -re8f31b0f922b402878356e130c866c4f3682a7f5
--- src/libchcore/TBasePathData.cpp	(.../TBasePathData.cpp)	(revision cb4e9d4b60d62b25ae2cf556c0642601af56c787)
+++ src/libchcore/TBasePathData.cpp	(.../TBasePathData.cpp)	(revision e8f31b0f922b402878356e130c866c4f3682a7f5)
@@ -90,7 +90,7 @@
 	void TBasePathData::Store(const ISerializerContainerPtr& spContainer) const
 	{
 		if (!spContainer)
-			THROW_CORE_EXCEPTION(eErr_InvalidPointer);
+			throw TCoreException(eErr_InvalidPointer, L"spContainer", LOCATION);
 
 		bool bAdded = m_setModifications[eMod_Added];
 		if (m_setModifications.any())
@@ -161,7 +161,7 @@
 	void TBasePathDataContainer::Store(const ISerializerContainerPtr& spContainer) const
 	{
 		if (!spContainer)
-			THROW_CORE_EXCEPTION(eErr_InvalidPointer);
+			throw TCoreException(eErr_InvalidPointer, L"spContainer", LOCATION);
 
 		boost::shared_lock<boost::shared_mutex> lock(m_lock);
 
@@ -179,7 +179,7 @@
 	void TBasePathDataContainer::Load(const ISerializerContainerPtr& spContainer)
 	{
 		if (!spContainer)
-			THROW_CORE_EXCEPTION(eErr_InvalidPointer);
+			throw TCoreException(eErr_InvalidPointer, L"spContainer", LOCATION);
 
 		boost::unique_lock<boost::shared_mutex> lock(m_lock);
 		m_setRemovedObjects.Clear();
@@ -210,7 +210,7 @@
 	{
 		boost::unique_lock<boost::shared_mutex> lock(m_lock);
 		if (fcIndex >= m_vEntries.size())
-			THROW_CORE_EXCEPTION(eErr_BoundsExceeded);
+			throw TCoreException(eErr_BoundsExceeded, L"fcIndex", LOCATION);
 
 		m_setRemovedObjects.Add(m_vEntries[boost::numeric_cast<size_t>(fcIndex)]->GetObjectID());
 		m_vEntries.erase(m_vEntries.begin() + boost::numeric_cast<size_t>(fcIndex));
@@ -231,7 +231,7 @@
 				return spItem;
 		}
 
-		THROW_CORE_EXCEPTION(eErr_InvalidArgument);
+		throw TCoreException(eErr_InvalidArgument, L"Object id does not exist", LOCATION);
 	}
 
 	void TBasePathDataContainer::ClearNL()