From de0c16729b75ce41328c65fc3628350eae582d59 Mon Sep 17 00:00:00 2001
From: Markos Gogoulos <markos@sixfeetup.com>
Date: Tue, 30 Dec 2025 15:43:42 +0200
Subject: [PATCH] a

---
 lti/adapters.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lti/adapters.py b/lti/adapters.py
index bedfb620..7336e17c 100644
--- a/lti/adapters.py
+++ b/lti/adapters.py
@@ -247,6 +247,11 @@ class DjangoServiceConnector(ServiceConnector):
 
         response.raise_for_status()
 
+        try:
+            response_body = response.json()
+        except ValueError:
+            raise ValueError(f"NRPS endpoint returned non-JSON response. Status: {response.status_code}, Content-Type: {response.headers.get('Content-Type')}, Body: {response.text[:500]}")
+
         next_page_url = None
         link_header = response.headers.get('Link')
         if link_header:
@@ -255,7 +260,7 @@ class DjangoServiceConnector(ServiceConnector):
                     next_page_url = link.split(';')[0].strip('<> ')
 
         return {
-            'body': response.json(),
+            'body': response_body,
             'status_code': response.status_code,
             'headers': dict(response.headers),
             'next_page_url': next_page_url,