diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 391e9fd..552927e 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -220,9 +220,11 @@
 
     public static Intent getContentIntent(Context context, SliceData sliceData) {
         final Uri contentUri = new Uri.Builder().appendPath(sliceData.getKey()).build();
+        final String screenTitle = TextUtils.isEmpty(sliceData.getScreenTitle()) ? null
+                : sliceData.getScreenTitle().toString();
         final Intent intent = buildSearchResultPageIntent(context,
                 sliceData.getFragmentClassName(), sliceData.getKey(),
-                sliceData.getScreenTitle().toString(), 0 /* TODO */);
+                screenTitle, 0 /* TODO */);
         intent.setClassName(context.getPackageName(), SubSettings.class.getName());
         intent.setData(contentUri);
         return intent;
@@ -399,7 +401,8 @@
 
         keywords.add(data.getTitle());
 
-        if (!TextUtils.equals(data.getTitle(), data.getScreenTitle())) {
+        if (!TextUtils.isEmpty(data.getScreenTitle())
+                && !TextUtils.equals(data.getTitle(), data.getScreenTitle())) {
             keywords.add(data.getScreenTitle().toString());
         }
 
