1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
index 43b9a3e..454222c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -1018,8 +1018,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
                 t.setClipViewInStack(false);
                 t.startLaunchTaskAnimation(r, true, true, lockToTask);
             } else {
-                boolean occludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(t.getTask(),
-                        launchTargetTask);
+                boolean occludesLaunchTarget = launchTargetTask != null &&
+                        launchTargetTask.group != null &&
+                        launchTargetTask.group.isTaskAboveTask(t.getTask(), launchTargetTask);
                 t.startLaunchTaskAnimation(null, false, occludesLaunchTarget, lockToTask);
             }
         }