--- a/harvester/common/src/harvestermediaidutil.cpp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/common/src/harvestermediaidutil.cpp	Fri Sep 17 16:54:49 2010 +0300
@@ -136,8 +136,10 @@
 		if (data->iRefCount <= 0)
 			{
 			delete data->iMediaIdUtil;
+			data->iMediaIdUtil = NULL;
 
 			delete data;
+			data = NULL;
 			UserSvr::DllFreeTls(KHarvesterMediaIdTLSKey);
 			}
 		}