diff --git a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
index 2f33da55c7e1af4c153de507e9cf3df5509d2e5f..ee4a6d846fbbaf74f3f52620535f29ff8e5d2170 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
@@ -167,9 +167,11 @@ public class VideoAdminTranscodingController extends FormBasicController {
 			List<VideoTranscoding> transcodings = videoManager.getVideoTranscodings(videoResource);
 			//map resource IDs to resolution
 			for (VideoTranscoding videoTranscoding : transcodings) {
-				if (videoTranscoding.getStatus() != -1 || true) {
-					availableTranscodings.get(videoTranscoding.getResolution())
-							.add(videoTranscoding.getVideoResource().getKey());
+				if (videoTranscoding != null && videoTranscoding.getStatus() != -1) {
+					Set<Long> oneResolution = availableTranscodings.get(videoTranscoding.getResolution());
+					if (oneResolution != null) {
+						oneResolution.add(videoTranscoding.getVideoResource().getKey());						
+					}
 				}
 			}
 		}