--- a/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -15,17 +15,15 @@
 *
 */
 
-
-#include "FolderAttributes.h"
+#include <folderattributes.h>
 #include "FeedsDatabase.h"
 #include "FeedsServer.h"
-#include "LeakTracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 #include "PackedFeed.h"
 #include "PackedFolder.h"
 #include "UpdateAllFeedsTask.h"
-#include <sysutil.h>
-
+#include <SysUtil.h>
 
 // -----------------------------------------------------------------------------
 // CUpdateAllFeedsTask::NewL
@@ -254,6 +252,9 @@
                 // Get feed's url from the datbase.
                 (void) iFeedsServer.Database().UrlFromFeedIdL(
                         iFeedIds[iNextFeedIndex], feedUrl);
+                
+                User::LeaveIfNull(feedUrl);
+                
                 CleanupStack::PushL(feedUrl);
                 
                 // Create a new task to update the feed.