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 4af421c20d31e3ef999fd5d6f91df4b63d1ceaca..c7386bec406eff4a2524d4b35e60b69e554749cd 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
@@ -523,7 +523,7 @@ public class VideoManagerImpl implements VideoManager {
 	public boolean hasMasterContainer (OLATResource videoResource) {
 		VFSContainer baseContainer =  FileResourceManager.getInstance().getFileResourceRootImpl(videoResource);
 		VFSContainer masterContainer = (VFSContainer) baseContainer.resolve(DIRNAME_MASTER);
-		return masterContainer != null;		
+		return masterContainer != null & masterContainer.exists();		
 	}
 	
 	@Override
@@ -875,16 +875,9 @@ public class VideoManagerImpl implements VideoManager {
 
 	@Override
 	public boolean hasVideoFile(OLATResource videoResource) {
-		try {
-			if (getVideoFile(videoResource) == null) {
-				return false;
-			} else {
-				return true;
-			}
-		} catch (Exception e) {
-			log.error("",e);
-			return false;
-		}		
+		VFSContainer masterContainer = getMasterContainer(videoResource);
+		LocalFileImpl videoFile = (LocalFileImpl) masterContainer.resolve(FILENAME_VIDEO_MP4);	
+		return videoFile != null & videoFile.exists();
 	}
 
 }