Merge branch 'OpenOLAT_13.2'

src/main/java/org/olat/modules/video/ui/VideoDisplayController.java

@@ -132,9 +132,7 @@ public class VideoDisplayController extends BasicController {
 		super(ureq, wControl);
 		this.videoEntry = videoEntry;
 		this.displayOptions = displayOptions;
-		this.descriptionText = displayOptions.isCustomDescription()
-				? displayOptions.getDescriptionText()
-				: courseNode.getLearningObjectives();
+		this.descriptionText = getDescription(courseNode, displayOptions);
 		
 		mainVC = createVelocityContainer("video_run");
 		putInitialPanel(mainVC);
@@ -199,6 +197,12 @@ public class VideoDisplayController extends BasicController {
 			}
 		}
 	}
+
+	private String getDescription(VideoCourseNode courseNode, VideoDisplayOptions displayOptions) {
+		if (displayOptions.isCustomDescription()) return displayOptions.getDescriptionText();
+		if (courseNode != null) return courseNode.getLearningObjectives();
+		return null;
+	}
 	
 	public VideoMeta getVideoMetadata() {
 		return videoMetadata;