diff --git a/build.gradle b/build.gradle
index bbe5dbcad..578b0da47 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ android {
 
     defaultConfig {
         applicationId "org.tasks"
-        versionCode 409
+        versionCode 410
         versionName "4.8.18"
         minSdkVersion 14
         targetSdkVersion 24
diff --git a/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java b/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java
index f9dbb6b13..20fd56302 100644
--- a/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java
+++ b/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java
@@ -117,6 +117,10 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
 
     @Override
     public void apply(Task task) {
+        if (selectedList == null) {
+            return;
+        }
+
         Metadata taskMetadata = gtasksMetadataService.getActiveTaskMetadata(task.getId());
         if (taskMetadata == null) {
             taskMetadata = GtasksMetadata.createEmptyMetadataWithoutList(task.getId());