--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp	Mon Oct 04 00:38:12 2010 +0300
@@ -54,11 +54,6 @@
     have been loaded first time.
 */
 
-// Created widget gets a property added containing the device dialog type.
-
-// declared but never referenced:
-//static const char deviceDialogTypePropertyName[] = "HbDevDlgPlugManXX";
-
 // Constructor
 HbDeviceDialogPluginManager::HbDeviceDialogPluginManager(Flags flags, QObject *parent) :
     QObject(parent), mNameCache(pluginKeys)
@@ -134,7 +129,10 @@
         if (pluginInstance) {
             HbDeviceDialogPluginInterface *pluginIf =
                 qobject_cast<HbDeviceDialogPluginInterface*>(pluginInstance);
-            widgetIf = pluginIf->createDeviceDialog(deviceDialogType, parameters);
+            try {
+                widgetIf = pluginIf->createDeviceDialog(deviceDialogType, parameters);
+            } catch (const std::bad_alloc &) {
+            }
             if (widgetIf) {
                 pluginInfo.mWidgets.append(widgetIf);
                 pluginInfo.mRefCount++;