--- a/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistresourcereaderimpl.cpp	Mon Mar 15 12:45:37 2010 +0200
+++ b/sysstatemgmt/systemstatemgr/cmd/src/ssmcommandlistresourcereaderimpl.cpp	Wed Mar 31 23:31:40 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -801,6 +801,12 @@
 				inProgress = EFalse;
 				break;
 				}
+			else if((iCommandIndexInRssFile[iCurrentCommandListInMapping] == 0))
+					{
+					//The current commandlist is empty 
+					//go to the next commandlist in the mapping.
+					continue;
+					}
 			else
 				{
 				//open the next resource id and read the commands