--- a/ImagePrint/ImagePrintUI/imgpprintdll/src/cdiscoverydlgmanager.cpp	Thu Jan 07 12:46:28 2010 +0200
+++ b/ImagePrint/ImagePrintUI/imgpprintdll/src/cdiscoverydlgmanager.cpp	Mon Jan 18 20:19:34 2010 +0200
@@ -264,13 +264,14 @@
 // Called when process completed
 void CDiscoveryDlgManager::DeviceDiscoveryCompleted()
 	{
-	LOG1("[CDiscoveryDlgManager::DeviceDiscoveryCompleted]\t Before dissmissing the process/wait dialog, iDiscoveryCompleted has value of %d", iDiscoveryCompleted);
 	// // Added this to avoid multiple "Search Again" texts, because server sends DeviceDiscoveryCompleted() more than once 
 	if( iDiscoveryCompleted )
 		{
 		return;
 		}
 
+    LOG1("[CDiscoveryDlgManager::DeviceDiscoveryCompleted]\t Before dissmissing the process/wait dialog, iDiscoveryCompleted has value of %d", iDiscoveryCompleted);
+
 	// Searching over, flag is essential
 	iSearchingCancelled = ETrue;
 
@@ -288,7 +289,7 @@
 		}
 
 	iDiscoveryCompleted = ETrue;
-	if ( iActivePopup )
+	if ((iActivePopup) && (iPopupList))
 		{
 		iPopupList->Heading()->CancelAnimation();