diff --git a/src/main/java/org/kitteh/irc/client/library/ActorProvider.java b/src/main/java/org/kitteh/irc/client/library/ActorProvider.java
index 66b1a25b6..2c3783e45 100644
--- a/src/main/java/org/kitteh/irc/client/library/ActorProvider.java
+++ b/src/main/java/org/kitteh/irc/client/library/ActorProvider.java
@@ -109,6 +109,7 @@ class IRCChannel extends IRCActor {
         private volatile boolean fullListReceived;
         private long lastWho = System.currentTimeMillis();
         private String topic;
+        @Nullable
         private Actor topicSetter;
         private long topicTime;
         private volatile boolean tracked;
diff --git a/src/main/java/org/kitteh/irc/client/library/Listener.java b/src/main/java/org/kitteh/irc/client/library/Listener.java
index bf73196bf..2101bdad2 100644
--- a/src/main/java/org/kitteh/irc/client/library/Listener.java
+++ b/src/main/java/org/kitteh/irc/client/library/Listener.java
@@ -25,6 +25,7 @@
 
 import org.kitteh.irc.client.library.util.QueueProcessingThread;
 
+import javax.annotation.Nullable;
 import java.util.Queue;
 import java.util.function.Consumer;
 
@@ -59,6 +60,7 @@ protected void cleanup(Queue<Type> remainingQueue) {
     }
 
     private final String clientName;
+    @Nullable
     private ListenerThread thread;
 
     Listener(String clientName, Consumer<Type> consumer) {
diff --git a/src/main/java/org/kitteh/irc/client/library/NettyManager.java b/src/main/java/org/kitteh/irc/client/library/NettyManager.java
index 7402baa10..813ed89ef 100644
--- a/src/main/java/org/kitteh/irc/client/library/NettyManager.java
+++ b/src/main/java/org/kitteh/irc/client/library/NettyManager.java
@@ -226,7 +226,9 @@ private void shutdown(@Nullable String message, boolean reconnect) {
         }
     }
 
+    @Nullable
     private static Bootstrap bootstrap;
+    @Nullable
     private static EventLoopGroup eventLoopGroup;
     private static final Set<ClientConnection> connections = new HashSet<>();
 
@@ -237,7 +239,9 @@ private NettyManager() {
     private static synchronized void removeClientConnection(@Nonnull ClientConnection connection, boolean reconnecting) {
         connections.remove(connection);
         if (!reconnecting && connections.isEmpty()) {
-            eventLoopGroup.shutdownGracefully();
+            if (eventLoopGroup != null) {
+                eventLoopGroup.shutdownGracefully();
+            }
             eventLoopGroup = null;
             bootstrap = null;
         }
diff --git a/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ActorChannelEventBase.java b/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ActorChannelEventBase.java
index cb58868da..869347316 100644
--- a/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ActorChannelEventBase.java
+++ b/src/main/java/org/kitteh/irc/client/library/event/abstractbase/ActorChannelEventBase.java
@@ -44,7 +44,7 @@ public abstract class ActorChannelEventBase<A extends Actor> extends ActorEventB
     private final Channel channel;
 
     /**
-     * Constructs thet event.
+     * Constructs the event.
      *
      * @param client the client
      * @param actor the actor