diff --git a/src/main/java/org/olat/core/util/FileUtils.java b/src/main/java/org/olat/core/util/FileUtils.java
index 420739154cea3b2fbf4201fc932833e235b677c6..5e1bb8ed42a1d4a4416beb45440c278ccb4ce1f4 100644
--- a/src/main/java/org/olat/core/util/FileUtils.java
+++ b/src/main/java/org/olat/core/util/FileUtils.java
@@ -792,10 +792,12 @@ public class FileUtils {
 	 * @return return empty String "" without suffix. 
 	 */
 	public static String getFileSuffix(String filePath) {
-		int lastDot = filePath.lastIndexOf('.');
-		if (lastDot > 0) {
-			if (lastDot < filePath.length())
-				return filePath.substring(lastDot + 1).toLowerCase();
+		if(StringHelper.containsNonWhitespace(filePath)) { 
+			int lastDot = filePath.lastIndexOf('.');
+			if (lastDot > 0) {
+				if (lastDot < filePath.length())
+					return filePath.substring(lastDot + 1).toLowerCase();
+			}
 		}
 		return "";
 	}