diff --git a/src/main/java/org/olat/core/util/SortedProperties.java b/src/main/java/org/olat/core/util/SortedProperties.java
index b1ab31c6c8c45720dbc77f5dad20fd4fece47232..d68b21da89d69b777fd159e39ab7067a8575da6c 100644
--- a/src/main/java/org/olat/core/util/SortedProperties.java
+++ b/src/main/java/org/olat/core/util/SortedProperties.java
@@ -56,12 +56,12 @@ public class SortedProperties extends Properties {
 	 * 
 	 * @see java.util.Hashtable#keys()
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "cast" })
 	@Override
 	public synchronized Enumeration<Object> keys() {
 		// sort elements based on detector (prop key) names
 		Set set = keySet();
-		return sortKeys(set);
+		return (Enumeration<Object>)sortKeys(set);
 	}
 
 	/**
diff --git a/src/main/java/org/olat/repository/handlers/VideoHandler.java b/src/main/java/org/olat/repository/handlers/VideoHandler.java
index b3ae4850699fca2eeed773ccb8abcf2bae610661..da84c074cd42a501947486ae00e7b1dbd57a00b5 100644
--- a/src/main/java/org/olat/repository/handlers/VideoHandler.java
+++ b/src/main/java/org/olat/repository/handlers/VideoHandler.java
@@ -122,7 +122,9 @@ public class VideoHandler extends FileHandler {
 				displayname, description, resource, RepositoryEntry.ACC_OWNERS);
 		DBFactory.getInstance().commit();		
 		
-
+		if(fileName == null) {
+			fileName = file.getName();
+		}
 		fileName = fileName.toLowerCase();
 		VFSLeaf importFile = new LocalFileImpl(file);
 		VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class);