diff --git a/app/src/main/java/com/limelight/preferences/AddComputerManually.java b/app/src/main/java/com/limelight/preferences/AddComputerManually.java
index 982132b5..7a25ba54 100644
--- a/app/src/main/java/com/limelight/preferences/AddComputerManually.java
+++ b/app/src/main/java/com/limelight/preferences/AddComputerManually.java
@@ -88,11 +88,11 @@ public class AddComputerManually extends Activity {
 
             // Couldn't find a matching interface
             return true;
-        } catch (SocketException e) {
+        } catch (Exception e) {
+            // Catch all exceptions because some broken Android devices
+            // will throw an NPE from inside getNetworkInterfaces().
             e.printStackTrace();
             return false;
-        } catch (UnknownHostException e) {
-            return false;
         }
     }