diff --git a/Habitica/src/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
index 5886b047e..f3ff12919 100644
--- a/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/com/habitrpg/android/habitica/APIHelper.java
@@ -246,6 +246,8 @@ public class APIHelper implements ErrorHandler, Profiler {
             } else if (status >= 500 && status < 600) {
                 showConnectionProblemDialog(activity,R.string.internal_error_api);
                 return cause;
+            } else if (status == 404 && cause.getUrl().endsWith("party/chat")) {
+                return cause;
             }
 		}
         showConnectionProblemDialog(activity, R.string.internal_error_api);
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java
index 803c315b9..f562d0eda 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/PartyFragment.java
@@ -47,30 +47,21 @@ public class PartyFragment extends BaseFragment {
 
         final ContentCache contentCache = new ContentCache(mAPIHelper.apiService);
 
-        if (this.user.getParty() == null ) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-                    .setMessage(activity.getString(R.string.no_party_message))
-                    .setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                        }
-                    });
-            builder.show();
-            return v;
-        } else if (this.user.getParty().id == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-                    .setMessage(activity.getString(R.string.no_party_message))
-                    .setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                        }
-                    });
-            builder.show();
-            return v;
-        }
-
         // Get the full group data
         mAPIHelper.apiService.getGroup("party", new Callback<Group>() {
             @Override
             public void success(Group group, Response response) {
+                if (group == null) {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+                            .setMessage(activity.getString(R.string.no_party_message))
+                            .setNeutralButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int which) {
+                                }
+                            });
+                    builder.show();
+                    tabLayout.removeAllTabs();
+                    return;
+                }
                 PartyFragment.this.group = group;
 
                 if (partyMemberListFragment != null) {
@@ -81,7 +72,7 @@ public class PartyFragment extends BaseFragment {
                     partyInformationFragment.setGroup(group);
                 }
 
-                if (group != null && group.quest != null && group.quest.key != null && !group.quest.key.isEmpty()) {
+                if (group.quest != null && group.quest.key != null && !group.quest.key.isEmpty()) {
                     contentCache.GetQuestContent(group.quest.key, new ContentCache.QuestContentCallback() {
                         @Override
                         public void GotQuest(QuestContent content) {
@@ -95,7 +86,6 @@ public class PartyFragment extends BaseFragment {
 
             @Override
             public void failure(RetrofitError error) {
-
             }
         });
         setViewPagerAdapter();