Index: samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentGradingFacadeQueries.java =================================================================== --- samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentGradingFacadeQueries.java (revision 306422) +++ samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentGradingFacadeQueries.java (working copy) @@ -1703,7 +1703,9 @@ while(iter.hasNext()) { itemIds.add((Long) iter.next()); } - + + if(itemIds.isEmpty()) return itemSet; + final HibernateCallback hcb2 = new HibernateCallback() { public Object doInHibernate(Session session) throws HibernateException, SQLException { Query q = session.createQuery( Index: samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/PublishedSectionData.java =================================================================== --- samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/PublishedSectionData.java (revision 306422) +++ samigo-hibernate/src/java/org/sakaiproject/tool/assessment/data/dao/assessment/PublishedSectionData.java (working copy) @@ -242,6 +242,8 @@ public ArrayList getItemArray() { ArrayList list = new ArrayList(); + if(itemSet == null) + itemSet = new HashSet(); Iterator iter = itemSet.iterator(); while (iter.hasNext()){ list.add(iter.next());