diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 4175a828840..48f2a059d0b 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -323,12 +323,10 @@ public class BluetoothSettings extends PreferenceActivity
 
         switch(mFilterType) {
         case BluetoothDevicePicker.FILTER_TYPE_TRANSFER:
-            if (uuids != null) {
+            if (uuids != null)
                 if (BluetoothUuid.containsAnyUuid(uuids,
                         LocalBluetoothProfileManager.OPP_PROFILE_UUIDS))  return true;
-            } else {
-                if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) return true;
-            }
+            if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) return true;
             break;
         case BluetoothDevicePicker.FILTER_TYPE_AUDIO:
             if (uuids != null) {
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
index 1214636c335..c3dfc208bf8 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -216,6 +216,7 @@ public class CachedBluetoothDeviceManager {
         case BluetoothDevice.UNBOND_REASON_DISCOVERY_IN_PROGRESS:
         case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT:
         case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS:
+        case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED:
             errorMsg = R.string.bluetooth_pairing_error_message;
             mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);
             break;