diff --git a/euclid/helpers/AgentConvo.py b/euclid/helpers/AgentConvo.py
index e9c364a..870fac1 100644
--- a/euclid/helpers/AgentConvo.py
+++ b/euclid/helpers/AgentConvo.py
@@ -49,7 +49,7 @@ class AgentConvo:
         # TODO remove this once the database is set up properly
         message_content = response[0] if type(response) == tuple else response
         if isinstance(message_content, list):
-            if isinstance(message_content[0], dict):
+            if len(message_content) > 0 and isinstance(message_content[0], dict):
                 string_response = [
                     f'#{i + 1}\n' + array_of_objects_to_string(d)
                     for i, d in enumerate(message_content)
diff --git a/euclid/helpers/agents/Developer.py b/euclid/helpers/agents/Developer.py
index 07aaf6e..87690d2 100644
--- a/euclid/helpers/agents/Developer.py
+++ b/euclid/helpers/agents/Developer.py
@@ -57,7 +57,7 @@ class Developer(Agent):
         for (i, step) in enumerate(task_steps):
             convo.load_branch('after_task_breakdown')
             if step['type'] == 'command':
-                run_command_until_success(cmd['command'], cmd['timeout'], convo_dev_task)
+                run_command_until_success(step['command'], step['command_timeout'], convo)
             elif step['type'] == 'code_change':
                 print(f'Implementing code changes for `{step["code_change_description"]}`')
                 code_monkey = CodeMonkey(self.project, self)