diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index c286d47af..f9070e879 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="1903"
+    android:versionCode="1904"
     android:versionName="1.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
index 3291df7b3..c6cdd7e84 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
@@ -28,7 +28,11 @@ abstract class RealmBaseLocalRepository implements BaseLocalRepository {
 
     @Override
     public <T extends RealmObject> T getUnmanagedCopy(T object) {
-        return realm.copyFromRealm(object);
+        if (object.isManaged() && object.isValid()) {
+            return realm.copyFromRealm(object);
+        } else {
+            return object;
+        }
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
index e60a61df8..4dd9a8f41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
@@ -124,7 +124,7 @@ public class ChallengeDetailActivity extends BaseActivity {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.menu_challenge_details, menu);
 
-        if(challenge != null && !challenge.leaderId.equals(userId)){
+        if(challenge != null && challenge.leaderId != null && !challenge.leaderId.equals(userId)){
             menu.setGroupVisible(R.id.challenge_edit_action_group, false);
         }