Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
diff -u -r2447250db06e37961dc34f540968aa843f4c2e6c -ra3e3ea0fe63acdf0a90f896d72c027e92e3f316c
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 2447250db06e37961dc34f540968aa843f4c2e6c)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision a3e3ea0fe63acdf0a90f896d72c027e92e3f316c)
@@ -332,11 +332,13 @@
 	    NodeConceptModel nodeConceptModel = nodeModel.getConcept();
 	    // saving branch
 	    List curMindmapNodeList = null;
-	    if (mindmapUser == null) {
-		curMindmapNodeList = getMindmapNodeByUniqueId(nodeConceptModel.getId(), mindmap.getUid());
-	    } else {
-		curMindmapNodeList = getMindmapNodeByUniqueIdMindmapIdUserId(nodeConceptModel.getId(),
-			mindmap.getUid(), mindmapUser.getUid());
+	    if (mindmap.getUid() != null) {
+		if (mindmapUser == null) {
+		    curMindmapNodeList = getMindmapNodeByUniqueId(nodeConceptModel.getId(), mindmap.getUid());
+		} else {
+		    curMindmapNodeList = getMindmapNodeByUniqueIdMindmapIdUserId(nodeConceptModel.getId(),
+			    mindmap.getUid(), mindmapUser.getUid());
+		}
 	    }
 
 	    MindmapNode currentMindmapNode = null;