From 8132c23bfb10bdf0a74fd75d341e0cd8687fac6f Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Mon, 18 Jan 2016 11:49:54 -0600
Subject: [PATCH] Fixed null pointer in OnlineInterfaceService

---
 src/services/admin/OnlineInterfaceService.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/services/admin/OnlineInterfaceService.java b/src/services/admin/OnlineInterfaceService.java
index 49daf0e1e..9dc1a8c77 100644
--- a/src/services/admin/OnlineInterfaceService.java
+++ b/src/services/admin/OnlineInterfaceService.java
@@ -123,7 +123,10 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac
 				}
 			}
 			if (!socket.isSecure()) {
-				socket.redirect(new URL("https", httpsServer.getBindAddress().getHostName(), httpsServer.getBindPort(), request.getURI().getPath()).toString());
+				String host = request.getURI().getHost();
+				if (host == null)
+					host = socket.getInetAddress().getHostName();
+				socket.redirect(new URL("https", host, httpsServer.getBindPort(), request.getURI().getPath()).toString());
 				return;
 			}
 			handler.handleRequest(socket, request);