1 files changed, 7 insertions, 4 deletions

diff --git a/cogs/assistant.py b/cogs/assistant.py
index 6cc1b03..a89c356 100644
--- a/cogs/assistant.py
+++ b/cogs/assistant.py
@@ -146,10 +146,13 @@ class Jarvis(commands.Cog):
     def _parse_response(response_data):
         content = response_data['choices'][0]['message']['content']
         inner_json_str = content.strip('```json\n').strip('```').strip()
-        inner_data = json.loads(inner_json_str)
-
-        response_message = inner_data['message']
-        action = inner_data['action']
+        try:
+            inner_data = json.loads(inner_json_str)
+            response_message = inner_data['message']
+            action = inner_data['action']
+        except (json.JSONDecodeError, KeyError):
+            response_message = content
+            action = "none"
 
         logger.info(response_message)
         logger.info(action)