From f11339bce577293de297a5bfb0107b97bedec620 Mon Sep 17 00:00:00 2001
From: Matthew Bell <mdbell@users.noreply.github.com>
Date: Thu, 25 Jun 2015 14:43:20 -0400
Subject: [PATCH] Another attempted fix at Network nulling

See title.
---
 .../src/org/parabot/core/network/NetworkInterface.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/parabotv2/src/org/parabot/core/network/NetworkInterface.java b/parabotv2/src/org/parabot/core/network/NetworkInterface.java
index 859671a..146c1cf 100644
--- a/parabotv2/src/org/parabot/core/network/NetworkInterface.java
+++ b/parabotv2/src/org/parabot/core/network/NetworkInterface.java
@@ -47,11 +47,14 @@ public class NetworkInterface {
 		if (realMac != null)
 			return realMac;
 		try {
-			return realMac = java.net.NetworkInterface.getByInetAddress(
+			byte[] b = java.net.NetworkInterface.getByInetAddress(
 					InetAddress.getLocalHost()).getHardwareAddress();
+			if(b == null)
+				b = mac;
+			realMac = b;
 		} catch (Exception ignored) {
 		}
-		return mac;
+		return realMac = mac;
 	}
 
 	public static NetworkInterface getByInetAddress(InetAddress addr) {