diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 102886dee..1c754ac7a 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -654,7 +654,10 @@ class Coder:
     def get_cur_message_text(self):
         text = ""
         for msg in self.cur_messages:
-            text += msg["content"] + "\n"
+            # For some models the content is None if the message
+            # contains tool calls.
+            content = msg["content"] or ""
+            text += content + "\n"
         return text
 
     def get_ident_mentions(self, text):