Fix some optionals from the merge.

src/com/dmdirc/Server.java

@@ -546,7 +546,7 @@ public class Server extends FrameContainer implements Connection {
         final String lnick = converter.toLowerCase(nick);
 
         if (!queries.containsKey(lnick)) {
-            final Query newQuery = queryFactory.getQuery(this, getUser(host).orElse(null));
+            final Query newQuery = queryFactory.getQuery(this, getUser(host));
             if (!getState().isDisconnected()) {
                 newQuery.reregister();
             }

src/com/dmdirc/ServerEventHandler.java

@@ -52,7 +52,6 @@ import com.dmdirc.events.ServerWallusersEvent;
 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.User;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
@@ -220,11 +219,7 @@ public class ServerEventHandler extends EventHandler implements
         final String format = EventUtils.postDisplayable(eventBus, event, "privateCTCP");
         owner.doNotification(format, owner.getParser().get().getClient(host), type, message);
         if (!event.isHandled()) {
-            owner.sendCTCPReply(
-                    owner.getUser(host)
-                            .map(User::getNickname)
-                            .orElseThrow(() -> new IllegalStateException("Couldn't get nickname")),
-                    type, message);
+            owner.sendCTCPReply(owner.getUser(host).getNickname(), type, message);
         }
     }
 

test/com/dmdirc/ServerEventHandlerTest.java

@@ -213,7 +213,7 @@ public class ServerEventHandlerTest {
 
     @Test
     public void testOnPrivateCTCPRaisesEvent() {
-        when(server.getUser("ho!st@name")).thenReturn(Optional.of(user));
+        when(server.getUser("ho!st@name")).thenReturn(user);
 
         final PrivateCtcpListener listener = getCallback(PrivateCtcpListener.class);
         listener.onPrivateCTCP(parser, date, "type", "message", "ho!st@name");
@@ -226,7 +226,7 @@ public class ServerEventHandlerTest {
 
     @Test
     public void testOnPrivateCTCPSendsReplyIfEventUnhandled() {
-        when(server.getUser("ho!st@name")).thenReturn(Optional.of(user));
+        when(server.getUser("ho!st@name")).thenReturn(user);
 
         final PrivateCtcpListener listener = getCallback(PrivateCtcpListener.class);
         listener.onPrivateCTCP(parser, date, "type", "message", "ho!st@name");