diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 5ca9622ba..39fa017d8 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -603,4 +603,5 @@
     <string name="new_challenge_title">New challenge title</string>
     <string name="ownership">Ownership</string>
     <string name="inn">Inn</string>
+    <string name="system">System</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index 7aaea791f..ddf457e6e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -212,9 +212,9 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
     public Observable<BuyResponse> buyItem(User user, String key, double value) {
         return apiClient.buyItem(key)
                 .doOnNext(buyResponse -> localRepository.executeTransaction(realm -> {
-                    buyResponse.items.setUserId(user.getId());
                     User copiedUser = localRepository.getUnmanagedCopy(user);
                     if (buyResponse.items != null) {
+                        buyResponse.items.setUserId(user.getId());
                         copiedUser.setItems(buyResponse.items);
                     }
                     if (buyResponse.hp != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
index 9bf090c95..03af15539 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
@@ -144,7 +144,11 @@ public class ChatRecyclerViewAdapter extends RealmRecyclerViewAdapter<ChatMessag
                 if (msg.sent != null && msg.sent.equals("true")) {
                     userLabel.setText(sendingUser.getProfile().getName());
                 } else {
-                    userLabel.setText(msg.user);
+                    if (msg.user != null && msg.user.length() > 0) {
+                        userLabel.setText(msg.user);
+                    } else {
+                        userLabel.setText(R.string.system);
+                    }
                 }
 
                 userLabel.setClickable(true);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java
index acbce7eea..5994ce137 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java
@@ -81,7 +81,7 @@ public class RewardsRecyclerViewAdapter extends RecyclerView.Adapter<RewardViewH
                             itemKeys.add(item.key);
                         }
                         itemKeys.add("potion");
-                        if (user != null && user.getFlags().getArmoireEnabled()) {
+                        if (user != null && user.getFlags() != null && user.getFlags().getArmoireEnabled()) {
                             itemKeys.add("armoire");
                         }
                         return itemKeys;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
index 7e1bffff1..55bff7da5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
@@ -76,9 +76,7 @@ public class PartyFragment extends BaseMainFragment {
             }
             socialRepository.retrieveGroup("party")
                     .flatMap(group1 -> socialRepository.retrieveGroupMembers(group1.id, true))
-                    .subscribe(members -> {
-                        members.size();
-                    }, RxErrorHandler.handleEmptyError());
+                    .subscribe(members -> {}, RxErrorHandler.handleEmptyError());
         }
 
         setViewPagerAdapter();