diff --git a/core/assets/version.properties b/core/assets/version.properties
index bac2905c1f..7010f82956 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Tue Mar 06 19:13:04 EST 2018
+#Tue Mar 06 22:21:33 EST 2018
 version=release
 androidBuildCode=335
 name=Mindustry
 code=3.4
-build=31
+build=custom build
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
index 5540538025..92065eb60c 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
@@ -17,6 +17,7 @@ import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.Locale;
 
 import static io.anuke.mindustry.Vars.*;
@@ -103,7 +104,11 @@ public class DesktopPlatform extends Platform {
     @Override
     public byte[] getUUID() {
         try {
-            byte[] bytes = NetworkInterface.getNetworkInterfaces().nextElement().getHardwareAddress();
+            Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
+            NetworkInterface out;
+            for(out = e.nextElement(); out.getHardwareAddress() == null && e.hasMoreElements(); out = e.nextElement());
+
+            byte[] bytes = out.getHardwareAddress();
             byte[] result = new byte[8];
             System.arraycopy(bytes, 0, result, 0, bytes.length);
             return result;