am 8cd49472: Preventing a crash on rotation of the Display Options activity
diff --git a/src/com/android/contacts/ui/ContactsPreferencesActivity.java b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
index 0432aaf..5a89745 100644
--- a/src/com/android/contacts/ui/ContactsPreferencesActivity.java
+++ b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
@@ -1050,7 +1050,13 @@
             final Context context = target;
 
             final ProgressDialog dialog = mProgress.get();
-            if (dialog != null) dialog.dismiss();
+            if (dialog != null) {
+                try {
+                    dialog.dismiss();
+                } catch (Exception e) {
+                    Log.e(TAG, "Error dismissing progress dialog", e);
+                }
+            }
 
             target.finish();