diff --git a/src/org/apollo/net/ApolloHandler.java b/src/org/apollo/net/ApolloHandler.java
index d6b00b91..91a12c80 100644
--- a/src/org/apollo/net/ApolloHandler.java
+++ b/src/org/apollo/net/ApolloHandler.java
@@ -72,15 +72,15 @@ public final class ApolloHandler extends ChannelInboundHandlerAdapter {
 
 			Session session = attr.get();
 
+			if (message instanceof HttpRequest || message instanceof JagGrabRequest) {
+				session = new UpdateSession(ctx.channel(), serverContext);
+			}
+
 			if (session != null) {
 				session.messageReceived(message);
 				return;
 			}
 
-			if (message instanceof HttpRequest || message instanceof JagGrabRequest) {
-				session = new UpdateSession(ctx.channel(), serverContext);
-			}
-
 			// TODO: Perhaps let HandshakeMessage implement Message to remove this explicit check
 			if (message instanceof HandshakeMessage) {
 				HandshakeMessage handshakeMessage = (HandshakeMessage) message;
diff --git a/src/org/apollo/net/codec/handshake/HandshakeDecoder.java b/src/org/apollo/net/codec/handshake/HandshakeDecoder.java
index b4f7f111..31da920c 100644
--- a/src/org/apollo/net/codec/handshake/HandshakeDecoder.java
+++ b/src/org/apollo/net/codec/handshake/HandshakeDecoder.java
@@ -26,7 +26,7 @@ public final class HandshakeDecoder extends ByteToMessageDecoder {
 	private static final Logger logger = Logger.getLogger(HandshakeDecoder.class.getName());
 
 	@Override
-	protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception {
+	protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) {
 		if (!buffer.isReadable()) {
 			return;
 		}
@@ -49,7 +49,7 @@ public final class HandshakeDecoder extends ByteToMessageDecoder {
 
 		default:
 			ByteBuf data = buffer.readBytes(buffer.readableBytes());
-			logger.info(String.format("Unecpected handshake request received: %d data: %s", id, data.toString()));
+			logger.info(String.format("Unexpected handshake request received: %d data: %s", id, data.toString()));
 			return;
 		}