diff --git a/infra/scripts/assign_azure_ai_user_role.sh b/infra/scripts/assign_foundry_user_role.sh
similarity index 98%
rename from infra/scripts/assign_azure_ai_user_role.sh
rename to infra/scripts/assign_foundry_user_role.sh
index 12326e806..fde7abb5a 100644
--- a/infra/scripts/assign_azure_ai_user_role.sh
+++ b/infra/scripts/assign_foundry_user_role.sh
@@ -4,6 +4,7 @@
 resource_group="$1"
 aif_resource_id="$2"
 principal_ids="$3"
+managedIdentityClientId="$4"
 
 
 # Authenticate with Azure
diff --git a/infra/scripts/cosmosdb_and_ai_user_role_assignment.sh b/infra/scripts/cosmosdb_and_foundry_user_role_assignment.sh
similarity index 94%
rename from infra/scripts/cosmosdb_and_ai_user_role_assignment.sh
rename to infra/scripts/cosmosdb_and_foundry_user_role_assignment.sh
index f8c14522a..f1ae7ced9 100644
--- a/infra/scripts/cosmosdb_and_ai_user_role_assignment.sh
+++ b/infra/scripts/cosmosdb_and_foundry_user_role_assignment.sh
@@ -153,11 +153,11 @@ fi
 echo "add_cosmosdb_access.sh completed successfully."
 
 
-# Call add_cosmosdb_access.sh
-echo "Running assign_azure_ai_user_role.sh"
-bash infra/scripts/assign_azure_ai_user_role.sh "$resourceGroupName" "$aif_resource_id" "$principal_ids" "$managedIdentityClientId"
+# Call assign_foundry_user_role.sh
+echo "Running assign_foundry_user_role.sh"
+bash infra/scripts/assign_foundry_user_role.sh "$resourceGroupName" "$aif_resource_id" "$principal_ids" "$managedIdentityClientId"
 if [ $? -ne 0 ]; then
-    echo "Error: assign_azure_ai_user_role.sh failed."
+    echo "Error: assign_foundry_user_role.sh failed."
     exit 1
 fi
-echo "assign_azure_ai_user_role.sh completed successfully."
\ No newline at end of file
+echo "assign_foundry_user_role.sh completed successfully."
\ No newline at end of file
diff --git a/src/App/src/hooks/usePlanWebSocket.tsx b/src/App/src/hooks/usePlanWebSocket.tsx
index af038e116..234768ff2 100644
--- a/src/App/src/hooks/usePlanWebSocket.tsx
+++ b/src/App/src/hooks/usePlanWebSocket.tsx
@@ -209,7 +209,7 @@ export function usePlanWebSocket({
                         steps: [],
                         next_steps: [],
                         content: formatErrorMessage(errorContent),
-                        raw_data: finalMessage || '',
+                        raw_data: finalMessage,
                     };
                     dispatch(addAgentMessage(errorAgent));
                     dispatch(planFailedFinal());