diff --git a/src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java b/src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
index 73e88ce2e2e251742493030e26d35b40fe6e1d2d..afd8063f77fe537e7c2aa72db48de37ce57f4c8d 100644
--- a/src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
+++ b/src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
@@ -1684,7 +1684,7 @@ public class GTAManagerImpl implements GTAManager {
 	public void log(String step, String operation, Task assignedTask, Identity actor, Identity assessedIdentity, BusinessGroup assessedGroup,
 			CourseEnvironment courseEnv, GTACourseNode cNode, Role by) {
 		//log
-		String taskName = StringHelper.containsNonWhitespace(assignedTask.getTaskName()) ? assignedTask.getTaskName() : assignedTask.getKey().toString();
+		String taskName = taskToString(assignedTask);
 		String msg = step + " of " + taskName + ": " + operation;
 		if(GTAType.group.name().equals(cNode.getModuleConfiguration().getStringValue(GTACourseNode.GTASK_TYPE))) {
 			log.audit(msg + " to business group: " + assessedGroup.getName(), null);
@@ -1703,7 +1703,7 @@ public class GTAManagerImpl implements GTAManager {
 		String operation = event.getLogMessage();
 		String file = event.getFilename();
 		//log
-		String taskName = StringHelper.containsNonWhitespace(assignedTask.getTaskName()) ? assignedTask.getTaskName() : assignedTask.getKey().toString();
+		String taskName = taskToString(assignedTask);
 		String msg = step + " of " + taskName + ": " + operation + " " + file;
 		if(GTAType.group.name().equals(cNode.getModuleConfiguration().getStringValue(GTACourseNode.GTASK_TYPE))) {
 			log.audit(msg + " to business group: " + assessedGroup.getName(), null);
@@ -1716,6 +1716,20 @@ public class GTAManagerImpl implements GTAManager {
 		}
 	}
 	
+	private String taskToString(Task assignedTask) {
+		String name;
+		if(assignedTask == null ) {
+			name = "no assignment";
+		} else if(StringHelper.containsNonWhitespace(assignedTask.getTaskName())) {
+			name = assignedTask.getTaskName();
+		} else if(assignedTask.getKey() != null) {
+			name = assignedTask.getKey().toString();
+		} else {
+			name = "no assignment";
+		}
+		return name;	
+	}
+	
 	private interface TaskListSynched {
 		
 		public void sync();