diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index ec73e3c47..7f3e2399f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -167,10 +167,17 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
             transaction.replace(R.id.main_view, mainFragment);
         } else {
             String lastFragment = getLastNavFragment();
-            if(ArrayUtils.contains(NAV_DRAWER_TAGS, lastFragment)) {
+            if (ArrayUtils.contains(NAV_DRAWER_TAGS, lastFragment)) {
                 loadFragment(lastFragment, null);
             } else {
-                loadFeedFragmentById(Integer.valueOf(lastFragment), null);
+                try {
+                    loadFeedFragmentById(Integer.valueOf(lastFragment), null);
+                } catch (NumberFormatException e) {
+                    // it's not a number, this happens if we removed
+                    // a label from the NAV_DRAWER_TAGS
+                    // give them a nice default...
+                    loadFragment(QueueFragment.TAG, null);
+                }
             }
         }
         externalPlayerFragment = new ExternalPlayerFragment();
diff --git a/app/src/main/res/layout/episodes_fragment.xml b/app/src/main/res/layout/episodes_fragment.xml
index 736a874b8..e0028a262 100644
--- a/app/src/main/res/layout/episodes_fragment.xml
+++ b/app/src/main/res/layout/episodes_fragment.xml
@@ -15,7 +15,6 @@
             android:id="@+id/viewpager"
             android:layout_width="match_parent"
             android:layout_height="0px"
-            android:layout_weight="1"
-            android:background="@android:color/white" />
+            android:layout_weight="1" />
 
 </LinearLayout>
\ No newline at end of file