Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -rf3735a316cb5d75ed51aff791a153820e3bf3173
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision f3735a316cb5d75ed51aff791a153820e3bf3173)
@@ -493,21 +493,23 @@
 	    Mindmap mindmap = (Mindmap) toolPOJO;
 
 	    String mindmapContent = mindmap.getMindmapExportContent();
-	    MindmapUser mindmapUser = null;
+	    if (mindmapContent != null) {
+		MindmapUser mindmapUser = null;
 
-	    XStream xstream = new XStream();
-	    xstream.alias("branch", NodeModel.class);
-	    NodeModel rootNodeModel = (NodeModel) xstream.fromXML(mindmapContent);
-	    NodeConceptModel nodeConceptModel = rootNodeModel.getConcept();
-	    List<NodeModel> branches = rootNodeModel.getBranch();
+		XStream xstream = new XStream();
+		xstream.alias("branch", NodeModel.class);
+		NodeModel rootNodeModel = (NodeModel) xstream.fromXML(mindmapContent);
+		NodeConceptModel nodeConceptModel = rootNodeModel.getConcept();
+		List<NodeModel> branches = rootNodeModel.getBranch();
 
-	    MindmapNode rootMindmapNode = null;
-	    rootMindmapNode = saveMindmapNode(rootMindmapNode, null, nodeConceptModel.getId(), nodeConceptModel
-		    .getText(), nodeConceptModel.getColor(), mindmapUser, mindmap, null);
+		MindmapNode rootMindmapNode = null;
+		rootMindmapNode = saveMindmapNode(rootMindmapNode, null, nodeConceptModel.getId(),
+			nodeConceptModel.getText(), nodeConceptModel.getColor(), mindmapUser, mindmap, null);
 
-	    // saving child Nodes into database
-	    if (branches != null) {
-		getChildMindmapNodes(branches, rootMindmapNode, mindmapUser, mindmap, null);
+		// saving child Nodes into database
+		if (branches != null) {
+		    getChildMindmapNodes(branches, rootMindmapNode, mindmapUser, mindmap, null);
+		}
 	    }
 
 	    // reset it to new toolContentId