diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index b96d42f1..f826c5d8 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -108,13 +108,18 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 
 							if(response.isSuccessful()) {
 
+								assert response.body() != null;
 								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-							}
-							else {
+							} else {
 
 								tinyDb.putBoolean("repoWatch", false);
-								Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+								if(response.code() != 404) {
+
+									Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+								}
 
 							}
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
index 1c5c7e1e..99a03108 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -101,13 +101,18 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
                             if(response.isSuccessful()) {
 
+                                assert response.body() != null;
                                 tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                            }
-                            else {
+                            } else {
 
                                 tinyDb.putBoolean("repoWatch", false);
-                                Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                if(response.code() != 404) {
+
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                }
 
                             }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index abed73ee..a807497f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -108,13 +108,18 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 
 							if(response.isSuccessful()) {
 
+								assert response.body() != null;
 								tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-							}
-							else {
+							} else {
 
 								tinyDb.putBoolean("repoWatch", false);
-								Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+								if(response.code() != 404) {
+
+									Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+								}
 
 							}
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
index 4376c254..95e2d8b4 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -105,13 +105,18 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
 
                             if(response.isSuccessful()) {
 
+                                assert response.body() != null;
                                 tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                            }
-                            else {
+                            } else {
 
                                 tinyDb.putBoolean("repoWatch", false);
-                                Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                if(response.code() != 404) {
+
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                }
 
                             }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
index 59bae830..c23c7edb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -105,13 +105,18 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
                             if(response.isSuccessful()) {
 
+                                assert response.body() != null;
                                 tinyDb.putBoolean("repoWatch", response.body().getSubscribed());
 
-                            }
-                            else {
+                            } else {
 
                                 tinyDb.putBoolean("repoWatch", false);
-                                Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                if(response.code() != 404) {
+
+                                    Toasty.info(context, context.getString(R.string.genericApiStatusError));
+
+                                }
 
                             }