diff --git a/src/Connection/messages.ts b/src/Connection/messages.ts
index 87af84f..c6a3bc8 100644
--- a/src/Connection/messages.ts
+++ b/src/Connection/messages.ts
@@ -272,19 +272,24 @@ const makeMessagesSocket = (config: SocketConfig) => {
 
 	/** Query a string to check if it has a url, if it does, return WAUrlInfo */
     const generateUrlInfo = async(text: string) => {
-        const response = await query({
+        const response: BinaryNode = await query({
 			json: new BinaryNode(
 				'query',
-				{type: 'url', url: text, epoch: currentEpoch().toString()}
+				{ 
+					type: 'url', 
+					url: text, 
+					epoch: currentEpoch().toString() 
+				}
 			), 
 			binaryTag: [26, WAFlag.ignore], 
 			expect200: true, 
 			requiresPhoneConnection: false
 		})
-        if(response[1]) {
-            response[1].jpegThumbnail = response[2]
+		const urlInfo = { ...response.attributes } as any as WAUrlInfo
+        if(response && response.data) {
+            urlInfo.jpegThumbnail = response.data as Buffer
         }
-        return response[1] as WAUrlInfo
+        return urlInfo
     }
 
 	/** Relay (send) a WAMessage; more advanced functionality to send a built WA Message, you may want to stick with sendMessage() */
diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts
index 1f0f9f7..7e81860 100644
--- a/src/Utils/messages.ts
+++ b/src/Utils/messages.ts
@@ -197,7 +197,7 @@ export const generateWAMessageContent = async(
 				extContent.title = data.title
 				extContent.previewType = 0
 			} catch (error) { // ignore if fails
-				
+				options.logger?.warn({ trace: error.stack }, 'url generation failed')
 			} 
 		}
 		m.extendedTextMessage = extContent