diff --git a/tmate-daemon-decoder.c b/tmate-daemon-decoder.c
index f4c8de70..ac48e3e2 100644
--- a/tmate-daemon-decoder.c
+++ b/tmate-daemon-decoder.c
@@ -372,7 +372,8 @@ static void tmate_fin(__unused struct tmate_session *session,
 static void tmate_reconnect(__unused struct tmate_session *session,
 			    __unused struct tmate_unpacker *uk)
 {
-	/* Used by the proxy */
+	if (!tmate_has_proxy())
+		tmate_fatal("Cannot do reconnections without the proxy");
 }
 
 static void restore_snapshot_grid(struct grid *grid, struct tmate_unpacker *uk)
diff --git a/tmate-msgpack.c b/tmate-msgpack.c
index 301e6d63..8adee32e 100644
--- a/tmate-msgpack.c
+++ b/tmate-msgpack.c
@@ -285,7 +285,6 @@ void tmate_decoder_init(struct tmate_decoder *decoder, tmate_decoder_reader *rea
 void tmate_decoder_get_buffer(struct tmate_decoder *decoder,
 			      char **buf, size_t *len)
 {
-	ssize_t current_size = msgpack_unpacker_message_size(&decoder->unpacker);
 	if (!msgpack_unpacker_reserve_buffer(&decoder->unpacker, UNPACKER_RESERVE_SIZE))
 		tmate_fatal("cannot expand decoder buffer");