diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuIconsAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuIconsAlgorithm.java
index 985cd0f1fa197..6d12752d9218f 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuIconsAlgorithm.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuIconsAlgorithm.java
@@ -60,6 +60,7 @@ public class PipMenuIconsAlgorithm {
         if (mViewRoot == null || mTopEndContainer == null || mDragHandle == null
                 || mSettingsButton == null || mDismissButton == null) {
             Log.e(TAG, "One if the required views is null.");
+            return;
         }
 
         //We only need to calculate the layout once since it does not change.