Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r35cf8bc552c7ec3b030123258466c0e2856dcc7e
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 35cf8bc552c7ec3b030123258466c0e2856dcc7e)
@@ -538,6 +538,11 @@
 	    QaServicePOJO.logger.error("throwing ToolException: WARNING!, retrieved toContent is null.");
 	    throw new ToolException("WARNING! Fail to create toContent. Can't continue!");
 	} else {
+	    // save questions first, because if Hibernate decides to flush Conditions first,
+	    // there is no cascade to questions and it may trigger an error
+	    for (QaQueContent question : toContent.getQaQueContents()) {
+		qaQuestionDAO.saveOrUpdateQaQueContent(question);
+	    }
 	    qaDAO.saveQa(toContent);
 	}