diff --git a/src/Utils/request/errorHandler.ts b/src/Utils/request/errorHandler.ts
index e83973cfeeb..df5689e4704 100644
--- a/src/Utils/request/errorHandler.ts
+++ b/src/Utils/request/errorHandler.ts
@@ -85,7 +85,7 @@ function isStructuredError(err: HTTPError["cause"]): err is StructuredError {
   return typeof err === "object" && !Array.isArray(err);
 }
 
-function handleStructuredErrors(cause: StructuredError) {
+export function handleStructuredErrors(cause: StructuredError) {
   for (const value of Object.values(cause)) {
     if (Array.isArray(value)) {
       value.forEach((err) => toast.error(err));
diff --git a/src/components/Common/AvatarEditModal.tsx b/src/components/Common/AvatarEditModal.tsx
index 65132eccd59..31d0f772a60 100644
--- a/src/components/Common/AvatarEditModal.tsx
+++ b/src/components/Common/AvatarEditModal.tsx
@@ -257,7 +257,12 @@ const AvatarEditModal = ({
 
               <div className="flex flex-col gap-2 pt-4 sm:flex-row">
                 <div>
-                  <Button id="upload-cover-image" variant="primary" asChild>
+                  <Button
+                    id="upload-cover-image"
+                    variant="primary"
+                    className="w-full"
+                    asChild
+                  >
                     <label className="cursor-pointer">
                       <CareIcon
                         icon="l-cloud-upload"
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 672ec1a99c1..c9f567e6ac1 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -27,6 +27,7 @@ import { FACILITY_FEATURE_TYPES } from "@/common/constants";
 
 import { PLUGIN_Component } from "@/PluginEngine";
 import routes from "@/Utils/request/api";
+import { handleStructuredErrors } from "@/Utils/request/errorHandler";
 import query from "@/Utils/request/query";
 import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
@@ -138,7 +139,12 @@ export const FacilityHome = ({ facilityId }: Props) => {
           toast.success(t("cover_image_updated"));
           setEditCoverImage(false);
         } else {
-          onError();
+          const response = JSON.parse(xhr.responseText);
+          response.errors.forEach((error: any) => {
+            if (error?.msg?.cover_image) {
+              handleStructuredErrors(error?.msg?.cover_image);
+            }
+          });
         }
       },
       null,
diff --git a/src/components/Users/UserAvatar.tsx b/src/components/Users/UserAvatar.tsx
index 93913c644a1..52d0cd25b44 100644
--- a/src/components/Users/UserAvatar.tsx
+++ b/src/components/Users/UserAvatar.tsx
@@ -15,6 +15,7 @@ import useAuthUser from "@/hooks/useAuthUser";
 
 import { showAvatarEdit } from "@/Utils/permissions";
 import routes from "@/Utils/request/api";
+import { handleStructuredErrors } from "@/Utils/request/errorHandler";
 import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
@@ -56,6 +57,13 @@ export default function UserAvatar({ username }: { username: string }) {
           queryClient.invalidateQueries({ queryKey: ["currentUser"] });
           toast.success(t("avatar_updated_success"));
           setEditAvatar(false);
+        } else {
+          const response = JSON.parse(xhr.responseText);
+          response.errors.forEach((error: any) => {
+            if (error?.msg?.profile_picture) {
+              handleStructuredErrors(error?.msg?.profile_picture);
+            }
+          });
         }
       },
       null,