diff --git a/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSession.kt b/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSession.kt
index fd457d52..cca42a54 100644
--- a/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSession.kt
+++ b/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSession.kt
@@ -121,32 +121,32 @@ class SyncSession : IAuthorizable {
     }
 
     fun handlePacket(socketSession: SyncSocketSession, opcode: UByte, subOpcode: UByte, data: ByteBuffer) {
-        Logger.i(TAG, "Handle packet (opcode: ${opcode}, subOpcode: ${subOpcode}, data.length: ${data.remaining()})")
-
-        when (opcode) {
-            Opcode.NOTIFY_AUTHORIZED.value -> {
-                _remoteAuthorized = true
-                checkAuthorized()
-            }
-            Opcode.NOTIFY_UNAUTHORIZED.value -> {
-                _remoteAuthorized = false
-                _onUnauthorized(this)
-            }
-            //TODO: Handle any kind of packet (that is not necessarily authorized)
-        }
-
-        if (!isAuthorized) {
-            return
-        }
-
-        if (opcode != Opcode.DATA.value) {
-            Logger.w(TAG, "Unknown opcode received: (opcode = ${opcode}, subOpcode = ${subOpcode})}")
-            return
-        }
-
-        Logger.i(TAG, "Received (opcode = ${opcode}, subOpcode = ${subOpcode}) (${data.remaining()} bytes)")
-        //TODO: Abstract this out
         try {
+            Logger.i(TAG, "Handle packet (opcode: ${opcode}, subOpcode: ${subOpcode}, data.length: ${data.remaining()})")
+
+            when (opcode) {
+                Opcode.NOTIFY_AUTHORIZED.value -> {
+                    _remoteAuthorized = true
+                    checkAuthorized()
+                }
+                Opcode.NOTIFY_UNAUTHORIZED.value -> {
+                    _remoteAuthorized = false
+                    _onUnauthorized(this)
+                }
+                //TODO: Handle any kind of packet (that is not necessarily authorized)
+            }
+
+            if (!isAuthorized) {
+                return
+            }
+
+            if (opcode != Opcode.DATA.value) {
+                Logger.w(TAG, "Unknown opcode received: (opcode = ${opcode}, subOpcode = ${subOpcode})}")
+                return
+            }
+
+            Logger.i(TAG, "Received (opcode = ${opcode}, subOpcode = ${subOpcode}) (${data.remaining()} bytes)")
+            //TODO: Abstract this out
             when (subOpcode) {
                 GJSyncOpcodes.sendToDevices -> {
                     StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
diff --git a/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt b/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt
index 6a5fd4a3..8b5f305a 100644
--- a/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt
+++ b/app/src/main/java/com/futo/platformplayer/sync/internal/SyncSocketSession.kt
@@ -274,7 +274,7 @@ class SyncSocketSession {
             _sendBuffer.asUByteArray()[4] = opcode
             _sendBuffer.asUByteArray()[5] = subOpcode
 
-            //Logger.i(TAG, "Encrypting message (size = ${HEADER_SIZE})")
+            //Logger.i(TAG, "Encrypting message (opcode = ${opcode}, subOpcode = ${subOpcode}, size = ${HEADER_SIZE})")
 
             val len = _cipherStatePair!!.sender.encryptWithAd(null, _sendBuffer, 0, _sendBufferEncrypted, 0, HEADER_SIZE)
             //Logger.i(TAG, "Sending encrypted message (size = ${len})")