diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
index 55797ecbf28529dde9fb595850cabbea7291421c..22384ff38a120fa1f7c55d470ae88af65f2d694e 100644
--- a/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
@@ -354,11 +354,13 @@ public class AssessmentResultController extends FormBasicController {
 
 		TestPlanNode section = node.getParent();
 		Results sectionResults = resultsMap.get(section);
-		sectionResults.addSubResults(assessmentItemResults);
-		if(assessmentItemResults.hasMaxScore()) {
-			sectionResults.addMaxScore(assessmentItemResults);
-			if(assessmentItemResults.hasScore()) {
-				sectionResults.addScore(assessmentItemResults);
+		if(sectionResults != null) {
+			sectionResults.addSubResults(assessmentItemResults);
+			if(assessmentItemResults.hasMaxScore()) {
+				sectionResults.addMaxScore(assessmentItemResults);
+				if(assessmentItemResults.hasScore()) {
+					sectionResults.addScore(assessmentItemResults);
+				}
 			}
 		}
 	}
diff --git a/src/main/java/org/olat/modules/fo/ui/MessageListController.java b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
index fec754d4dbf0c883818c746d07f108e97a27a4a2..ce8536ebf522a805cf1f7ed55846ca3f344e542a 100644
--- a/src/main/java/org/olat/modules/fo/ui/MessageListController.java
+++ b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
@@ -309,8 +309,19 @@ public class MessageListController extends BasicController implements GenericEve
 			}
 		} else if(message != null) {
 			MessageView view = loadView(ureq, message);
-			backupViews.add(view);
-			
+			int index = 0;
+			for(int i=0; i<backupViews.size(); i++) {
+				if(backupViews.get(i).getKey().equals(message.getKey())) {
+					backupViews.remove(backupViews.get(i));
+					index = i;
+					break;
+				}
+			}
+			if(index >= 0) {
+				backupViews.add(index, view);
+			} else {
+				backupViews.add(view);
+			}
 			mainVC.contextPut("messages", backupViews);
 			messageTableCtrl.loadMessages(new ArrayList<>(0));
 
diff --git a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
index 57cc11737d5d1ba84c0515a6bd1000f585f685d2..28d716d331bdb941e33f368a739c93495e1941d2 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
@@ -369,17 +369,6 @@ public class VideoManagerImpl implements VideoManager {
 		}
 	}
 
-//	/**
-//	 * Write the metdatadata-xml in the videoresource folder
-//	 * @param metaData
-//	 * @param videoResource
-//	 */
-//	private void writeVideoMetadataFile(VideoMetadata metaData, OLATResource videoResource){
-//		VFSContainer baseContainer= FileResourceManager.getInstance().getFileResourceRootImpl(videoResource);
-//		VFSLeaf metaDataFile = VFSManager.resolveOrCreateLeafFromPath(baseContainer, FILENAME_VIDEO_METADATA_XML);
-//		XStreamHelper.writeObject(XStreamHelper.createXStreamInstance(), metaDataFile, metaData);
-//	}
-
 	@Override
 	public boolean isMetadataFileValid(OLATResource videoResource) {
 		VFSContainer baseContainer = FileResourceManager.getInstance().getFileResourceRootImpl(videoResource);
@@ -388,7 +377,6 @@ public class VideoManagerImpl implements VideoManager {
 			VideoMetadata meta = (VideoMetadata) XStreamHelper.readObject(XStreamHelper.createXStreamInstance(), metaDataFile);
 			return meta != null;
 		} catch (Exception e) {
-			log.error("Error while parsing XStream file for videoResource::" + videoResource, e);
 			return false;
 		}
 	}
@@ -578,8 +566,8 @@ public class VideoManagerImpl implements VideoManager {
 	@Override
 	public boolean hasMasterContainer (OLATResource videoResource) {
 		VFSContainer baseContainer =  FileResourceManager.getInstance().getFileResourceRootImpl(videoResource);
-		VFSContainer masterContainer = (VFSContainer) baseContainer.resolve(DIRNAME_MASTER);
-		return masterContainer != null & masterContainer.exists();		
+		VFSItem masterContainer = baseContainer.resolve(DIRNAME_MASTER);
+		return masterContainer instanceof VFSContainer && masterContainer.exists();		
 	}
 	
 	@Override