diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 63a3ff04e88db..f05ef8c588cdd 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7580,8 +7580,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
             mHardwareLayer.destroy();
             mHardwareLayer = null;
         }
-        mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_MSG, this);
-        mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_RECT_MSG, this);
+
+        if (mAttachInfo != null) {
+            mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_MSG, this);
+            mAttachInfo.mHandler.removeMessages(AttachInfo.INVALIDATE_RECT_MSG, this);
+        }
+
         mCurrentAnimation = null;
     }