diff --git a/agent/bedrock_adapter.py b/agent/bedrock_adapter.py
index d5dab7bafff2..013b2d233046 100644
--- a/agent/bedrock_adapter.py
+++ b/agent/bedrock_adapter.py
@@ -519,7 +519,7 @@ def _convert_content_to_converse(content) -> List[Dict]:
                 blocks.append({"text": text if text else " "})
             elif part_type == "image_url":
                 image_url = part.get("image_url", {})
-                url = image_url.get("url", "") if isinstance(image_url, dict) else ""
+                url = (image_url.get("url") or "") if isinstance(image_url, dict) else ""
                 if url.startswith("data:"):
                     # data:image/jpeg;base64,/9j/4AAQ...
                     header, _, data = url.partition(",")
@@ -1145,7 +1145,7 @@ def discover_bedrock_models(
 
             # Only include active, streaming-capable, text-output models
             lifecycle = summary.get("modelLifecycle", {})
-            if lifecycle.get("status", "").upper() != "ACTIVE":
+            if (lifecycle.get("status") or "").upper() != "ACTIVE":
                 continue
             if not summary.get("responseStreamingSupported", False):
                 continue