Log an exception when Android return null on establishtun

1 files changed, 4 insertions, 1 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 41306db8..81dea416 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -612,7 +612,10 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
 
         try {
             //Debug.stopMethodTracing();
-            return builder.establish();
+            ParcelFileDescriptor tun = builder.establish();
+            if (tun==null)
+                throw new NullPointerException("Android establish() method returned null (Really broken network configuration?)");
+            return tun;
         } catch (Exception e) {
             VpnStatus.logError(R.string.tun_open_error);
             VpnStatus.logError(getString(R.string.error) + e.getLocalizedMessage());