--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp	Wed Apr 14 16:23:43 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp	Tue Apr 27 17:05:00 2010 +0300
@@ -369,25 +369,36 @@
 		{			
 		HandlePacketError(errorCode);
 		return;
-		} 
+		}
+	
+	//Work out what SUPL Protocol Hanlder version should be used
 	if( major == 1 )
 		{
+		//SUPL v1
 		if(iOMASuplProtocolHandler1)
 		    {
 		    iOMASuplProtocolHandler1->HandlePacket(aPacket,aPortNum);
 		    }
 		}
-	else 
+	else if ( major == 2 )
 		{
+		//SUPL v2
 		if(iOMASuplProtocolHandler2)
             {
             iOMASuplProtocolHandler2->HandlePacket(aPacket,aPortNum);
-            }	
-    else
-    	if (iOMASuplProtocolHandler1)
+            }
+		}
+	else
+		{
+		//Use either of the Protocol Handlers to handle the packet 
+		if (iOMASuplProtocolHandler1)
     		{
     		iOMASuplProtocolHandler1->HandlePacket(aPacket,aPortNum);
     		}
+		else if(iOMASuplProtocolHandler2)
+            {
+            iOMASuplProtocolHandler2->HandlePacket(aPacket,aPortNum);
+            } 
 		}			
 	}
 
@@ -506,25 +517,35 @@
 		return;
 		}
 
+	//Work out what SUPL Protocol Hanlder version should be used
 	TInt major = aSuplSession->GetSUPLVersion();	
 	if( major == 1 )
 		{
+		//SUPL v1
 		if(iOMASuplProtocolHandler1)
 		    {
 		    iOMASuplProtocolHandler1->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
 		    }
 		}
-	else 
+	else if( major == 2 )
 		{
+		//SUPL v2
 		if(iOMASuplProtocolHandler2)
 		    {
 		    iOMASuplProtocolHandler2->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
 		    }
-		else
-    	if (iOMASuplProtocolHandler1)
+		}
+	else
+		{
+		//Use either of the Protocol Handlers (if they exist) to handle the packet 
+		if (iOMASuplProtocolHandler1)
     		{
     		iOMASuplProtocolHandler1->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
     		}
+		else if(iOMASuplProtocolHandler2)
+		    {
+		    iOMASuplProtocolHandler2->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
+		    }    	
 		}			
 	}