diff --git a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java
index c0dfebb9e9..2f52d5d100 100644
--- a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java
+++ b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java
@@ -19,6 +19,9 @@
 package org.csploit.android.net;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import org.csploit.android.core.System;
+import org.csploit.android.helpers.NetworkHelper;
 
 import java.io.BufferedReader;
 import java.math.BigInteger;
@@ -26,9 +29,6 @@
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
-import org.csploit.android.core.System;
-import org.csploit.android.helpers.NetworkHelper;
-
 public class Endpoint implements Comparable<Endpoint>
 {
   private InetAddress mAddress = null;
@@ -57,9 +57,9 @@ public Endpoint(String address){
     this(address, null);
   }
 
-  public Endpoint(InetAddress address, byte[] hardware){
+  public Endpoint(InetAddress address, @Nullable byte[] hardware){
     mAddress = address;
-    mHardware = Arrays.copyOf(hardware, hardware.length);
+    mHardware = hardware != null ? Arrays.copyOf(hardware, hardware.length) : null;
   }
 
   public Endpoint(String address, String hardware){
diff --git a/cSploit/src/main/java/org/csploit/android/net/Network.java b/cSploit/src/main/java/org/csploit/android/net/Network.java
index a560cae834..b4ad47e191 100644
--- a/cSploit/src/main/java/org/csploit/android/net/Network.java
+++ b/cSploit/src/main/java/org/csploit/android/net/Network.java
@@ -25,20 +25,15 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Patterns;
-
 import org.apache.commons.net.util.SubnetUtils;
 import org.csploit.android.core.Logger;
 import org.csploit.android.core.System;
 import org.csploit.android.helpers.NetworkHelper;
 
 import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.net.InterfaceAddress;
-import java.net.NetworkInterface;
-import java.net.NoRouteToHostException;
-import java.net.SocketException;
-import java.net.UnknownHostException;
+import java.net.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -339,9 +334,10 @@ public byte[] getGatewayHardware() {
     return Endpoint.parseMacAddress(mWifiInfo.getBSSID());
   }
 
+  @Nullable
   public byte[] getLocalHardware() {
     try {
-      return mInterface.getHardwareAddress();
+      return mInterface.getHardwareAddress(); //FIXME: #831
     } catch (SocketException e) {
       System.errorLogging(e);
     }