Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.32 -r1.33
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	28 Oct 2013 14:28:02 -0000	1.32
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	31 Oct 2013 14:25:17 -0000	1.33
@@ -954,8 +954,11 @@
 		    Double lessonMaxMark = 0d;
 		    Set<ToolActivity> activities = lessonActivitiesMap.get(lesson.getLessonId());
 		    
-		    userRow[i++] = new ExcelCell(learner.getFirstName().toUpperCase(), false);
-		    userRow[i++] = new ExcelCell(learner.getLastName().toUpperCase(), false);
+		    String lastName = (learner.getLastName() == null) ? learner.getLogin().toUpperCase() : learner
+			    .getLastName().toUpperCase();
+		    userRow[i++] = new ExcelCell(lastName, false);
+		    String firstName = (learner.getFirstName() == null) ? "" : learner.getFirstName().toUpperCase();
+		    userRow[i++] = new ExcelCell(firstName, false);
 		    
 		    //check if learner is participating in this lesson
 		    if (!lesson.getAllLearners().contains(learner)) {