--- a/application/src/PodcastFeedView.cpp	Sun Apr 04 00:21:57 2010 +0100
+++ b/application/src/PodcastFeedView.cpp	Sun Apr 04 15:54:17 2010 +0100
@@ -204,17 +204,12 @@
 
 	switch(aEventType)
 		{
-		case EEventPenDownOnItem:
-			DP("PEN DOWN");
-			break;
-			
 #ifndef SYMBIAN1_UI
 	case EEventItemClicked:
 #endif
 	case EEventEnterKeyPressed:
 	case EEventItemDoubleClicked:
 	case EEventItemActioned:
-		DP("DOUBLE TAP");
 			{
 			const RFeedInfoArray* sortedItems = NULL;
 			TInt index = iListContainer->Listbox()->CurrentItemIndex();
@@ -334,7 +329,8 @@
 		}
 	else
 		{
-		iPodcastModel.FeedEngine().GetStatsByFeed(aFeedInfo.Uid(), showCount, unplayedCount);	
+		// we will get a leave if there are no shows for this feed, for instance, which is fine
+		TRAP_IGNORE(iPodcastModel.FeedEngine().GetStatsByFeedL(aFeedInfo.Uid(), showCount, unplayedCount));	
 		
 		if (unplayedCount) {
 			unplayedShows.Format(*iFeedsFormat, unplayedCount);
@@ -370,7 +366,7 @@
 		}
 	CArrayPtr<CGulIcon>* icons = iListContainer->Listbox()->ItemDrawer()->FormattedCellData()->IconArray();
 	iconIndex = iFeedIdForIconArray.Find(aFeedInfo.Uid());
-	if(iconIndex == KErrNotFound && aFeedInfo.FeedIcon() != NULL && 
+	if(iconIndex == KErrNotFound && aFeedInfo.FeedIcon() != NULL && aFeedInfo.ImageFileName().Length() > 0 && 
 			aFeedInfo.FeedIcon()->SizeInPixels().iHeight > 0 &&
 			aFeedInfo.FeedIcon()->SizeInPixels().iWidth > 0)
 		{