diff --git a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
index 121208505b1c83b5ff248e2c87258db46f967747..97762a53ff74063f54d8820b59cc0491197b0ce3 100644
--- a/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
@@ -209,6 +209,10 @@ class DroidtoothPlugin implements DuplexPlugin {
 				tryToClose(socket);
 				return;
 			}
+			if(LOG.isLoggable(INFO)) {
+				String address = s.getRemoteDevice().getAddress();
+				LOG.info("Connection from " + address);
+			}
 			callback.incomingConnectionCreated(wrapSocket(s));
 		}
 	}
diff --git a/briar-core/src/org/briarproject/db/JdbcDatabase.java b/briar-core/src/org/briarproject/db/JdbcDatabase.java
index 3178847e7d26791cc6c463ffedda19bd3e2c321b..5722f7a1e9f224cc8b186787db263d94629af066 100644
--- a/briar-core/src/org/briarproject/db/JdbcDatabase.java
+++ b/briar-core/src/org/briarproject/db/JdbcDatabase.java
@@ -404,16 +404,16 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	private void tryToClose(ResultSet rs) {
-		if(rs != null) try {
-			rs.close();
+		try {
+			if(rs != null) rs.close();
 		} catch(SQLException e) {
 			if(LOG.isLoggable(WARNING))LOG.log(WARNING, e.toString(), e);
 		}
 	}
 
 	private void tryToClose(Statement s) {
-		if(s != null) try {
-			s.close();
+		try {
+			if(s != null) s.close();
 		} catch(SQLException e) {
 			if(LOG.isLoggable(WARNING))LOG.log(WARNING, e.toString(), e);
 		}
diff --git a/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java b/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
index 6c71796a746aca0cdd3d5824a117212790b0f44f..38c96f893e837ab3eccebf8d5ae300fe7f4b28a3 100644
--- a/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
+++ b/briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
@@ -339,7 +339,7 @@ class BluetoothPlugin implements DuplexPlugin {
 
 		private void tryToClose(StreamConnection s) {
 			try {
-				s.close();
+				if(s != null) s.close();
 			} catch(IOException e) {
 				if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
diff --git a/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java b/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java
index c7d035fed6142cbac33dbb0eea692b6ff65d5fa5..5cabb5cf0c7373b0f11d12335be6a1a8b065b20c 100644
--- a/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java
+++ b/briar-desktop/src/org/briarproject/plugins/modem/ModemImpl.java
@@ -114,7 +114,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
 
 	private void tryToClose(SerialPort port) {
 		try {
-			port.closePort();
+			if(port != null) port.closePort();
 		} catch(IOException e) {
 			if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}