diff --git a/src/main/java/org/olat/modules/portfolio/manager/BinderDAO.java b/src/main/java/org/olat/modules/portfolio/manager/BinderDAO.java
index 9256411d7047a8c8fa9107080e33d37148d6bcb7..41123e7c47bfef74ce0ae753d6510b476489b996 100644
--- a/src/main/java/org/olat/modules/portfolio/manager/BinderDAO.java
+++ b/src/main/java/org/olat/modules/portfolio/manager/BinderDAO.java
@@ -36,6 +36,8 @@ import org.olat.basesecurity.Invitation;
 import org.olat.basesecurity.manager.GroupDAO;
 import org.olat.core.commons.persistence.DB;
 import org.olat.core.id.Identity;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
 import org.olat.core.util.StringHelper;
 import org.olat.modules.portfolio.Assignment;
 import org.olat.modules.portfolio.AssignmentStatus;
@@ -67,6 +69,8 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BinderDAO {
+	
+	private static final OLog log = Tracing.createLoggerFor(BinderDAO.class);
 
 	@Autowired
 	private DB dbInstance;
@@ -248,6 +252,11 @@ public class BinderDAO {
 		
 		List<Assignment> currentAssignments = new ArrayList<>(currentSection.getAssignments());
 		for(Assignment currentAssignment:currentAssignments) {
+			if(currentAssignment == null) {
+				log.error("Missing assignment: " + currentSection.getKey());
+				continue;
+			}
+			
 			Assignment refAssignment = currentAssignment.getTemplateReference();
 			if(refAssignment == null) {
 				if(currentAssignment.getAssignmentStatus() != AssignmentStatus.deleted) {