diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 411f144cf..8bac53b10 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="1920"
+    android:versionCode="1921"
     android:versionName="1.1.5"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
index 8071a5610..8fce50500 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
@@ -41,7 +41,7 @@ public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> im
     @Override
     public Observable<Tag> createTags(Collection<Tag> tags) {
         return Observable.defer(() -> Observable.from(tags))
-                .filter(tag -> !tag.getName().isEmpty())
+                .filter(tag -> tag.getName() != null && !tag.getName().isEmpty())
                 .flatMap(this::createTag);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 16b683d07..46f8805b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -311,7 +311,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         btnDelete.setOnClickListener(view -> new AlertDialog.Builder(view.getContext())
                 .setTitle(getString(R.string.taskform_delete_title))
                 .setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes), (dialog, which) -> {
-                    if (task != null) {
+                    if (task != null && task.isValid()) {
                         taskRepository.deleteTask(task.getId());
                     }