diff --git a/src/main/java/org/olat/modules/webFeed/managers/FeedManagerImpl.java b/src/main/java/org/olat/modules/webFeed/managers/FeedManagerImpl.java
index 3becd59efc5e3be680b4b8f348dbdc6cfd4830b9..4f1ad184b3fc6745cec904a47144098c1b3a6f33 100644
--- a/src/main/java/org/olat/modules/webFeed/managers/FeedManagerImpl.java
+++ b/src/main/java/org/olat/modules/webFeed/managers/FeedManagerImpl.java
@@ -1019,7 +1019,9 @@ public class FeedManagerImpl extends FeedManager {
 			item = item.resolve(itemId);
 			item = item.resolve(MEDIA_DIR);
 			item = item.resolve(fileName);
-			mediaResource = new VFSMediaResource((VFSLeaf) item);
+			if(item instanceof VFSLeaf) {
+				mediaResource = new VFSMediaResource((VFSLeaf)item);
+			}
 		} catch (NullPointerException e) {
 			log.debug("Media resource could not be created from file: ", fileName);
 		}
@@ -1037,7 +1039,9 @@ public class FeedManagerImpl extends FeedManager {
 		try {
 			VFSItem item = getFeedMediaContainer(feed);
 			item = item.resolve(fileName);
-			mediaResource = new VFSMediaResource((VFSLeaf) item);
+			if(item instanceof VFSLeaf) {
+				mediaResource = new VFSMediaResource((VFSLeaf)item);
+			}
 		} catch (NullPointerException e) {
 			log.debug("Media resource could not be created from file: ", fileName);
 		}
diff --git a/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java b/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java
index 21305648c39c9de2adb8e117261ac3de4bdd6870..b984d74e2f8a9806323c1b7f996af55493731274 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java
+++ b/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java
@@ -218,11 +218,16 @@ class FeedFormController extends FormBasicController {
 	 * @param newResource
 	 */
 	private void setImage(MediaResource newResource) {
+		if(newResource == null) {
+			unsetImage();
+			return;
+		}
+		
 		image.setMediaResource(newResource);
 		image.setMaxWithAndHeightToFitWithin(150, 150);
 		imageContainer.setVisible(true);
 		// This is needed. ImageContainer is not displayed otherwise.
-		this.getInitialComponent().setDirty(true);
+		getInitialComponent().setDirty(true);
 		imageDeleted = false;
 		file.setLabel(null, null);
 	}