Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java,v
diff -u -r1.9.2.3 -r1.9.2.4
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	15 Jun 2015 22:26:43 -0000	1.9.2.3
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java	31 Jul 2015 07:14:53 -0000	1.9.2.4
@@ -374,14 +374,14 @@
 	    iter.remove();
 	}
 
-	// ************************* Handle rating criterias *******************
-	List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap.get(AttributeNames.ATTR_RATING_CRITERIAS);
-	service.saveRatingCriterias(request, oldCriterias, contentId);
-
 	// **********************************************
 	// finally persist imageGalleryPO again
 	service.saveOrUpdateImageGallery(imageGalleryPO);
 
+	// ************************* Handle rating criterias *******************
+	List<RatingCriteria> oldCriterias = (List<RatingCriteria>) sessionMap.get(AttributeNames.ATTR_RATING_CRITERIAS);
+	service.saveRatingCriterias(request, oldCriterias, contentId);
+
 	imageGalleryForm.setImageGallery(imageGalleryPO);
 
 	request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.39.2.3 -r1.39.2.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	3 Jul 2015 17:01:11 -0000	1.39.2.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	31 Jul 2015 07:14:56 -0000	1.39.2.4
@@ -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);