Index: lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java
===================================================================
diff -u -rccfd66f1abbfc63cd0ed0a044f89914418d67cd1 -r56eadf4934636b30bf058073511cb9503f5326bb
--- lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java	(.../BaseDAO.java)	(revision ccfd66f1abbfc63cd0ed0a044f89914418d67cd1)
+++ lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java	(.../BaseDAO.java)	(revision 56eadf4934636b30bf058073511cb9503f5326bb)
@@ -96,14 +96,18 @@
 	public void insertOrUpdate(Object object) {
 		getHibernateTemplate().saveOrUpdate(object);
 	}
+    
+        /* (non-Javadoc)
+         * @see org.lamsfoundation.lams.dao.IBaseDAO#insertOrUpdateAll(java.util.Collection)
+         */
+        public void insertOrUpdateAll(Collection objects) {
+        	if (objects != null) {
+        	    for (Object object : objects) {
+        		getHibernateTemplate().saveOrUpdate(object);
+        	    }
+        	}
+        }
 
-	/* (non-Javadoc)
-	 * @see org.lamsfoundation.lams.dao.IBaseDAO#insertOrUpdateAll(java.util.Collection)
-	 */
-	public void insertOrUpdateAll(Collection objects) {
-		getHibernateTemplate().saveOrUpdateAll(objects);
-	}
-
 	public void update(String queryString) {
 		getHibernateTemplate().bulkUpdate(queryString);
 	}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java
===================================================================
diff -u -r2aaccb954583cd8431759dca8e912a8fe863aa0e -r56eadf4934636b30bf058073511cb9503f5326bb
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java	(.../QaWizardDAO.java)	(revision 2aaccb954583cd8431759dca8e912a8fe863aa0e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaWizardDAO.java	(.../QaWizardDAO.java)	(revision 56eadf4934636b30bf058073511cb9503f5326bb)
@@ -44,9 +44,13 @@
     private static final String QUERY_GET_CATEGORY = "from " + QaWizardCategory.class.getName() + " c where c.uid=?";
     private static final String QUERY_GET_SKILL = "from " + QaWizardCognitiveSkill.class.getName() + " c where c.uid=?";
     private static final String QUERY_GET_QUESTION = "from " + QaWizardQuestion.class.getName() + " q where q.uid=?";
-    
+
     public void saveOrUpdateCategories(SortedSet<QaWizardCategory> categories) {
-	getHibernateTemplate().saveOrUpdateAll(categories);
+	if (categories != null) {
+	    for (QaWizardCategory category : categories) {
+		getHibernateTemplate().saveOrUpdate(category);
+	    }
+	}
     }
 
     @SuppressWarnings("unchecked")