Simplify code.

[xudocci.git] / src / main / java / net / pterodactylus / xdcc / core / Core.java

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 5bcccf3..68628d7 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -557,12 +557,16 @@ public class Core extends AbstractExecutionThreadService {
                        return;
                }
 
+               Optional<Channel> channel = getChannel(network.get(), channelNotJoined.channel());
+               if (!channel.isPresent()) {
+                       eventBus.post(new GenericMessage(format("Could not join %s but didn’t try to join, either.", channel.get())));
+                       return;
+               }
+
                if (channelNotJoined.reason() == registeredNicknamesOnly) {
-                       Optional<Channel> channel = getChannel(network.get(), channelNotJoined.channel());
-                       if (channel.isPresent()) {
-                               eventBus.post(new GenericMessage(format("Not trying to join %s anymore.", channel.get())));
-                               channels.remove(channel.get());
-                       }
+                       channels.remove(channel.get());
+                       eventBus.post(new GenericMessage(
+                                       format("Not trying to join %s anymore.", channel.get())));
                        return;
                }
                if (channelNotJoined.reason() == banned) {