diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java index 478d59425..9df713343 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java @@ -175,6 +175,11 @@ class AndroidBluetoothPlugin } catch (IOException e) { IoUtils.tryToClose(s, LOG, WARNING); throw e; + } catch (NullPointerException e) { + // BluetoothSocket#connect() may throw an NPE under unknown + // circumstances + IoUtils.tryToClose(s, LOG, WARNING); + throw new IOException(e); } }