diff -r 3673b591050c -r ef55b168cedb mtpfws/mtpfw/src/cmtpdeltadatamgr.cpp
--- a/mtpfws/mtpfw/src/cmtpdeltadatamgr.cpp	Wed Apr 14 16:49:36 2010 +0300
+++ b/mtpfws/mtpfw/src/cmtpdeltadatamgr.cpp	Tue Apr 27 17:30:23 2010 +0300
@@ -291,7 +291,7 @@
 	TInt64 puidlow = 1;
 	TBuf8<KMTPPuidSize> puidBuffer;
 	
-	for(TInt count=0;count <aMaxArraySize;count++)
+	for(TInt count=0;count <aMaxArraySize && iView.AtRow();count++)
 		{
 		iView.GetL();
 		//Get the data from the current row
@@ -370,7 +370,7 @@
 	TInt64 puidlow = 1;
 	TBuf8<KMTPPuidSize> puidBuffer;
 	
-	for(TInt count=0;count <aMaxArraySize;count++)
+	for(TInt count=0;count <aMaxArraySize && iView.AtRow();count++)
 		{
 
 		iView.GetL();
@@ -442,7 +442,7 @@
 	TInt64 puidlow = 1;
 	TBuf8<KMTPPuidSize> puidBuffer;
 	
-	for(TInt count=0;count <aMaxArraySize;count++)
+	for(TInt count=0;count <aMaxArraySize && iView.AtRow();count++)
 		{
 
 		iView.GetL();
@@ -514,7 +514,7 @@
 	TInt64 puidlow = 1;
 	TBuf8<KMTPPuidSize> puidBuffer;
 	
-	for(TInt count=0;count <aMaxArraySize;count++)
+	for(TInt count=0;count <aMaxArraySize && iView.AtRow();count++)
 		{
 		iView.GetL();
 		//Get the data from the current row