2 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 799121b..b7a42c3 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -127,7 +127,12 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
         mVolumeId = getArguments().getString(VolumeInfo.EXTRA_VOLUME_ID);
         mVolume = mStorageManager.findVolumeById(mVolumeId);
 
-        Preconditions.checkNotNull(mVolume);
+        if (mVolume == null) {
+            Log.d(TAG, "Leaving details fragment due to missing volume");
+            finish();
+            return;
+        }
+
         Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PRIVATE);
 
         addPreferencesFromResource(R.xml.device_info_storage_volume);
diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
index 08117ba..8e912eb 100644
--- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -90,7 +90,12 @@ public class PublicVolumeSettings extends SettingsPreferenceFragment {
             mVolume = mStorageManager.findVolumeById(volId);
         }
 
-        Preconditions.checkNotNull(mVolume);
+        if (mVolume == null) {
+            Log.d(TAG, "Leaving details fragment due to missing volume");
+            finish();
+            return;
+        }
+
         Preconditions.checkState(mVolume.getType() == VolumeInfo.TYPE_PUBLIC);
 
         mDisk = mStorageManager.findDiskById(mVolume.getDiskId());