diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 286d9e5195d..dedeb7b5d16 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -73,21 +73,20 @@ public class ChartDataUsagePreference extends Preference {
     }
 
     private void onUpdateView() {
-        UsageView chart = mUsageView;
-        if ((chart == null) || (mNetworkCycleChartData == null)) {
+        if ((mUsageView == null) || (mNetworkCycleChartData == null)) {
             return;
         }
         final int top = getTop();
-        chart.clearPaths();
-        chart.configureGraph(toInt(mEnd - mStart), top);
-        calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());
-        setupContentDescription(chart, mNetworkCycleChartData.getUsageBuckets());
-        chart.setBottomLabels(new CharSequence[] {
+        mUsageView.clearPaths();
+        mUsageView.configureGraph(toInt(mEnd - mStart), top);
+        calcPoints(mUsageView, mNetworkCycleChartData.getUsageBuckets());
+        setupContentDescription(mUsageView, mNetworkCycleChartData.getUsageBuckets());
+        mUsageView.setBottomLabels(new CharSequence[] {
                 Utils.formatDateRange(getContext(), mStart, mStart),
                 Utils.formatDateRange(getContext(), mEnd, mEnd),
         });
 
-        bindNetworkPolicy(chart, mPolicy, top);
+        bindNetworkPolicy(mUsageView, mPolicy, top);
     }
 
     public int getTop() {
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 2f4054d1def..e98d4e30c28 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -315,6 +315,9 @@ public class DataUsageList extends DataUsageBaseFragment
      */
     @VisibleForTesting
     void updatePolicy() {
+        if (mHeader == null) {
+            return;
+        }
         final NetworkPolicy policy = services.mPolicyEditor.getPolicy(mTemplate);
         final View configureButton = mHeader.findViewById(R.id.filter_settings);
         //SUB SELECT