diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 26fde189d..6d9107921 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
 
     <application
         android:name="de.danoeh.antennapod.PodcastApp"
-        android:debuggable="false"
+        android:debuggable="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:logo="@drawable/ic_launcher"
diff --git a/src/de/danoeh/antennapod/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java
index 2aab5c5de..6479f9864 100644
--- a/src/de/danoeh/antennapod/feed/FeedManager.java
+++ b/src/de/danoeh/antennapod/feed/FeedManager.java
@@ -710,7 +710,7 @@ public class FeedManager {
 	public FeedMedia getFeedMedia(long id, Feed feed) {
 		if (feed != null) {
 			for (FeedItem item : feed.getItems()) {
-				if (item.getMedia().getId() == id) {
+				if (item.getMedia() != null && item.getMedia().getId() == id) {
 					return item.getMedia();
 				}
 			}