Index: sam/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentGradingFacadeQueries.java
===================================================================
--- sam/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentGradingFacadeQueries.java	(revision 131116)
+++ sam/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/AssessmentGradingFacadeQueries.java	(revision 310545)
@@ -2170,7 +2170,7 @@
 						  Long answerid = grade.getPublishedAnswerId();
 						  String temptext = "No Answer";
 						  Long sequence = null;
-						  if (answerid != null) {
+						  if (answerid != null && answerid >0) {
 							  AnswerIfc answer  = (AnswerIfc)publishedAnswerHash.get(answerid);
 							  temptext = answer.getText();
 							  if (temptext == null) {
@@ -2178,8 +2178,11 @@
 							  }
 							  sequence = answer.getItemText().getSequence();
 						  }
-						  else {
-							  ItemTextIfc itemTextIfc = (ItemTextIfc) publishedItemTextHash.get(grade.getPublishedItemTextId());
+						  else{
+                              if (answerid == -1){
+                                  temptext = "None of the Above";
+                              }
+                              ItemTextIfc itemTextIfc = (ItemTextIfc) publishedItemTextHash.get(grade.getPublishedItemTextId());
 							  sequence = itemTextIfc.getSequence();
 						  }
 						  thistext = sequence + ": " + temptext;