--- a/messagingapp/msgutils/unidatautils/unidatamodelplugins/unimmsdataplugin/src/unimmsdataplugin.cpp	Tue Jul 06 14:12:40 2010 +0300
+++ b/messagingapp/msgutils/unidatautils/unidatamodelplugins/unimmsdataplugin/src/unimmsdataplugin.cpp	Wed Aug 18 09:45:25 2010 +0300
@@ -23,7 +23,7 @@
 UniMMSDataPlugin::UniMMSDataPlugin(QObject* parent) :
     QObject(parent)
 {
-    d_ptr = new UniMMSDataPluginPrivate();
+    d_ptr = q_check_ptr (new UniMMSDataPluginPrivate());
 }
 
 UniMMSDataPlugin::~UniMMSDataPlugin()
@@ -138,11 +138,14 @@
     int error;    
     TRAP(error,d_ptr->restoreL(mtm));    
     QDEBUG_WRITE_FORMAT("Exiting restore with error= ",error);
+    qt_symbian_throwIfError(error);
 }
 
 QString UniMMSDataPlugin::subject()
 {
-    return d_ptr->subject(); 
+    QString subject;
+    TRAPD(err, subject =d_ptr->subjectL());
+    return  subject;
 }
 
 CMsvSession* UniMMSDataPlugin::session()