diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/BackupAndRestoreManager.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/BackupAndRestoreManager.java
index 9cedfe435..2715f7d9b 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/BackupAndRestoreManager.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/BackupAndRestoreManager.java
@@ -158,7 +158,7 @@ public class BackupAndRestoreManager implements MotherActivity.OnPermissions {
 
         if (mDataDir.isDirectory() && !FileHelpers.isEmpty(mDataDir)) {
             File destination = new File(currentBackup, mDataDir.getName());
-            FileHelpers.copy(mDataDir, destination);
+            FileHelpers.copy(mDataDir, destination, fileName -> Helpers.endsWithAny(fileName.toString(), mBackupPatterns));
 
             // Don't store unique id
             FileHelpers.delete(new File(destination, HiddenPrefs.SHARED_PREFERENCES_NAME + ".xml"));
diff --git a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/main/MainApplication.java b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/main/MainApplication.java
index 2f6793ed2..19b8a8ab5 100644
--- a/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/main/MainApplication.java
+++ b/smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/main/MainApplication.java
@@ -105,7 +105,7 @@ public class MainApplication extends MultiDexApplication { // fix: Didn't find c
     }
 
     private void applyCrashFixes(Throwable e) {
-        if (e instanceof OutOfMemoryError) {
+        if (e instanceof OutOfMemoryError || e.getCause() instanceof OutOfMemoryError) {
             Class<?> view = ViewManager.instance(getApplicationContext()).getTopView();
             if (view == PlaybackView.class) {
                 PlayerTweaksData tweaksData = PlayerTweaksData.instance(getApplicationContext());