diff --git a/app/src/fdroid/res/xml/file_paths.xml b/app/src/fdroid/res/xml/file_paths.xml
index 1d2a9d9f..758bbce9 100644
--- a/app/src/fdroid/res/xml/file_paths.xml
+++ b/app/src/fdroid/res/xml/file_paths.xml
@@ -2,7 +2,7 @@
 <paths>
     <external-path
         name="my_images"
-        path="Android/data/fr.gouv.etalab.mastodon.test/files/Pictures" />
+        path="Android/data/fr.gouv.etalab.mastodon/files/Pictures" />
 
     <cache-path
         name="*"
diff --git a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java
index 51fd8f32..b763e87f 100644
--- a/app/src/main/java/app/fedilab/android/activities/ContextActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ContextActivity.java
@@ -82,7 +82,7 @@ public class ContextActivity extends BaseActivity {
         focusedStatus = null; // or other values
         if (b != null)
             focusedStatus = (Status) b.getSerializable(Helper.ARG_STATUS);
-        if (focusedStatus == null) {
+        if (focusedStatus == null && currentAccount == null || currentAccount.mastodon_account == null) {
             finish();
             return;
         }
diff --git a/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java b/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java
index fc1d0b19..d3f56ce4 100644
--- a/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java
+++ b/app/src/main/java/app/fedilab/android/client/entities/app/QuickLoad.java
@@ -309,7 +309,7 @@ public class QuickLoad {
         QuickLoad localQuickLoad = getSavedValue(account, Timeline.TimeLineEnum.LOCAL, null);
         QuickLoad publicQuickLoad = getSavedValue(account, Timeline.TimeLineEnum.PUBLIC, null);
 
-        if (homeQuickLoad != null && homeQuickLoad.statuses != null) {
+        if (homeQuickLoad != null && homeQuickLoad.statuses != null && newStatus != null) {
             for (int i = 0; i < homeQuickLoad.statuses.size(); i++) {
                 if (homeQuickLoad.statuses.get(i).id.equals(newStatus.id)) {
                     homeQuickLoad.statuses.set(i, newStatus);
@@ -327,7 +327,7 @@ public class QuickLoad {
                 e.printStackTrace();
             }
         }
-        if (localQuickLoad != null && localQuickLoad.statuses != null) {
+        if (localQuickLoad != null && localQuickLoad.statuses != null && newStatus != null) {
             for (int i = 0; i < localQuickLoad.statuses.size(); i++) {
                 if (localQuickLoad.statuses.get(i).id.equals(newStatus.id)) {
                     localQuickLoad.statuses.set(i, newStatus);
@@ -345,7 +345,7 @@ public class QuickLoad {
                 e.printStackTrace();
             }
         }
-        if (publicQuickLoad != null && publicQuickLoad.statuses != null) {
+        if (publicQuickLoad != null && publicQuickLoad.statuses != null && newStatus != null) {
             for (int i = 0; i < publicQuickLoad.statuses.size(); i++) {
                 if (publicQuickLoad.statuses.get(i).id.equals(newStatus.id)) {
                     publicQuickLoad.statuses.set(i, newStatus);
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentNotificationsSettings.java b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentNotificationsSettings.java
index 2e8e13e3..58fb82ba 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentNotificationsSettings.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentNotificationsSettings.java
@@ -179,7 +179,13 @@ public class FragmentNotificationsSettings extends PreferenceFragmentCompat impl
                 PushHelper.startStreaming(requireActivity());
             }
             if (key.compareToIgnoreCase(getString(R.string.SET_LED_COLOUR_VAL)) == 0) {
-                sharedPreferences.edit().putInt(getString(R.string.SET_LED_COLOUR_VAL), Integer.parseInt(key)).apply();
+                try {
+                    int value = Integer.parseInt(key);
+                    sharedPreferences.edit().putInt(getString(R.string.SET_LED_COLOUR_VAL), value).apply();
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
+                }
+
             }
         }
     }
diff --git a/app/src/playstore/res/xml/file_paths.xml b/app/src/playstore/res/xml/file_paths.xml
index 368f15ac..08135b5a 100644
--- a/app/src/playstore/res/xml/file_paths.xml
+++ b/app/src/playstore/res/xml/file_paths.xml
@@ -2,7 +2,7 @@
 <paths>
     <external-path
         name="my_images"
-        path="Android/data/app.fedilab.android.test/files/Pictures" />
+        path="Android/data/app.fedilab.android/files/Pictures" />
 
     <cache-path
         name="*"