diff --git a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
index c8070e46..6f1dbf1a 100644
--- a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
+++ b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java
@@ -160,10 +160,10 @@ public class TinyProtocol implements Listener {
 		private PacketInterceptor(Player player) {
 			this.player = player;
 
-			channel = getChannel.get(connections.stream().filter(connection -> player.getUniqueId().equals(getUUID.get(connection))).findAny().orElseThrow(() -> {
+			channel = connections.stream().filter(connection -> player.getUniqueId().equals(getUUID.get(connection))).map(getChannel::get).filter(Channel::isActive).findAny().orElseThrow(() -> {
 				Bukkit.getScheduler().runTask(plugin, () -> player.kickPlayer("Connection failure."));
 				return new SecurityException("Could not find channel for player " + player.getName());
-			}));
+			});
 
 			if(!channel.isActive())
 				return;
@@ -175,11 +175,11 @@ public class TinyProtocol implements Listener {
 
 			try {
 				channel.pipeline().addBefore("packet_handler", HANDLER_NAME, this);
-			} catch (IllegalArgumentException e) {
+			} catch (IllegalArgumentException | NoSuchElementException e) {
 				Bukkit.getScheduler().runTask(plugin, () -> player.kickPlayer("Connection failure."));
 				throw new SecurityException(e);
 			}
-		}
+        }
 
 		private void sendPacket(Object packet) {
 			channel.pipeline().writeAndFlush(packet);