diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
index b8b56061..db94f092 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
@@ -73,6 +73,11 @@ public class FeedParser {
 			feed.setUrl(feedUrl);
 			feed.setLink(rss.getLink());
 			List<SyndEntry> items = rss.getEntries();
+
+			if (items.isEmpty()) {
+				throw new FeedException("No items in the feed.");
+			}
+
 			for (SyndEntry item : items) {
 				FeedEntry entry = new FeedEntry();