diff --git a/src/common/pluginmanager.cpp b/src/common/pluginmanager.cpp
index fd20fe8a1..e07804822 100644
--- a/src/common/pluginmanager.cpp
+++ b/src/common/pluginmanager.cpp
@@ -322,19 +322,21 @@ void PluginManager::loadXMLPlugin( const QString& fileName )
 			QString pname = pluginfo->pluginScriptName();
 			if (pname != "")
 			{
-				pluginnamespaces << pname;
+				QString plugnamespace = pluginNameSpace() + "." + pname;
+				pluginnamespaces << plugnamespace;
 				scriptplugcode += pluginNameSpace() + "." + pname + " = { };\n";
 				QStringList filters = pluginfo->filterNames();
 				foreach(QString filter,filters)
 				{
+					QString completename = plugnamespace;
 					fc.act = new QAction(filter,par);
 					stringXMLFilterMap.insert(filter,fc);
 					QString filterFunction = pluginfo->filterScriptCode(filter);
 					if (filterFunction == "")
 						filterFunction = gen.funCodeGenerator(filter,*pluginfo);
 					QString jname = pluginfo->filterAttribute(filter,MLXMLElNames::filterScriptFunctName);
-					QString completename = pluginNameSpace() + "." + pname + "." + jname;
-					filterscriptnames << jname;
+					completename += "." + jname;
+					filterscriptnames << completename;
 					scriptplugcode += completename + " = " + filterFunction + "\n";
 					completename += "(" + gen.parNames(filter,*pluginfo) + ")";
 					filtersign << completename;
diff --git a/src/common/scriptinterface.cpp b/src/common/scriptinterface.cpp
index 4406ded2e..d17fa50bc 100644
--- a/src/common/scriptinterface.cpp
+++ b/src/common/scriptinterface.cpp
@@ -337,7 +337,9 @@ Q_INVOKABLE int MeshDocumentSI::currentId()
 
 Q_INVOKABLE int MeshDocumentSI::setCurrent(const int meshId)
 {
-	int id = md->mm()->id();
+	int id = -1;
+	if (md->mm() != NULL)
+		id = md->mm()->id();
 	if (md->getMesh(meshId) != NULL)
 	{
 		md->setCurrentMesh(meshId);