diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java b/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java index bf75cf7aad..215980a2d0 100644 --- a/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java +++ b/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java @@ -427,8 +427,13 @@ public class FeedServlet extends DSpaceServlet } channel.setItems(items); - - return channel; + + // If the description is null, replace it with an empty string + // to avoid a FeedException + if (channel.getDescription() == null) + channel.setDescription(""); + + return channel; } catch (BrowseException e) {