Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
diff -u -rc625cc6ab9f7ecf8b52d200e78e865d4eddb257e -rc39d9b658708f32a187a7ce68e7e7698bd27f4a1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision c625cc6ab9f7ecf8b52d200e78e865d4eddb257e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision c39d9b658708f32a187a7ce68e7e7698bd27f4a1)
@@ -157,12 +157,7 @@
 		    qaContent.getQaQueContents().remove(removeableQuestion);
 		    qaService.removeQuestion(removeableQuestion);
 		}
-	    }
-	    
-	    // ************************* Handle rating criterias *******************
-	    List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap
-		    .get(AttributeNames.ATTR_RATING_CRITERIAS);
-	    qaService.saveRatingCriterias(request, oldCriterias, toolContentID);
+	    }	    
 
 	    // store content
 	    SortedSet<QaCondition> conditionSet = (SortedSet<QaCondition>) sessionMap
@@ -181,6 +176,11 @@
 		qaService.saveOrUpdateQuestion(existingQaQueContent);
 		displayOrder++;
 	    }
+	    
+	    // ************************* Handle rating criterias *******************
+	    List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap
+		    .get(AttributeNames.ATTR_RATING_CRITERIAS);
+	    qaService.saveRatingCriterias(request, oldCriterias, toolContentID);
 
 	    QaUtils.setFormProperties(request, qaAuthoringForm, qaGeneralAuthoringDTO, strToolContentID, httpSessionID);