diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandler.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandler.java
index fb28d58c4..2928ba836 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandler.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/FeedHandler.java
@@ -57,7 +57,7 @@ public class FeedHandler {
         Iterator<FeedItem> it = list.iterator();
         while (it.hasNext()) {
             FeedItem item = it.next();
-            if (seen.contains(item.getItemIdentifier())) {
+            if (!TextUtils.isEmpty(item.getItemIdentifier()) && seen.contains(item.getItemIdentifier())) {
                 Log.d(TAG, "Removing duplicate episode guid " + item.getItemIdentifier());
                 it.remove();
                 continue;
@@ -71,7 +71,7 @@ public class FeedHandler {
                 it.remove();
             } else {
                 seen.add(item.getMedia().getStreamUrl());
-                if (TextUtils.isEmpty(item.getTitle()) || TextUtils.isEmpty(item.getPubDate().toString())) {
+                if (TextUtils.isEmpty(item.getTitle()) || item.getPubDate() == null) {
                     continue;
                 }
                 if (!seen.contains(item.getTitle() + item.getPubDate().toString())) {