diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
index 0e6bcc58b7c0c..dbee0ee8f5d56 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGroupingUtil.java
@@ -129,7 +129,7 @@ public class NotificationGroupingUtil {
      */
     public void updateChildrenAppearance() {
         List<ExpandableNotificationRow> notificationChildren = mRow.getAttachedChildren();
-        if (notificationChildren == null) {
+        if (notificationChildren == null || !mRow.isSummaryWithChildren()) {
             return;
         }
         // Initialize the processors
@@ -256,8 +256,8 @@ public class NotificationGroupingUtil {
         }
 
         public void init() {
-            mParentView = mParentRow.getNotificationViewWrapper().getNotificationHeader()
-                    .findViewById(mId);
+            View header = mParentRow.getNotificationViewWrapper().getNotificationHeader();
+            mParentView = header == null ? null : header.findViewById(mId);
             mParentData = mExtractor == null ? null : mExtractor.extractData(mParentRow);
             mApply = !mComparator.isEmpty(mParentView);
         }