diff --git a/ivatar/ivataraccount/views.py b/ivatar/ivataraccount/views.py
index 588a65e..15ac030 100644
--- a/ivatar/ivataraccount/views.py
+++ b/ivatar/ivataraccount/views.py
@@ -379,10 +379,22 @@ class AssignBlueskyHandleToEmailView(SuccessMessageMixin, TemplateView):
             bs = Bluesky()
 
             bs.get_avatar(bluesky_handle)
-            email.set_bluesky_handle(bluesky_handle)
         except Exception as e:
             messages.error(request, _(f"Handle '{bluesky_handle}' not found: {e}"))
-            return HttpResponseRedirect(reverse_lazy("profile"))
+            return HttpResponseRedirect(
+                reverse_lazy(
+                    "assign_photo_email", kwargs={"email_id": int(kwargs["email_id"])}
+                )
+            )
+        try:
+            email.set_bluesky_handle(bluesky_handle)
+        except Exception as e:
+            messages.error(request, _(f"Error: {e}"))
+            return HttpResponseRedirect(
+                reverse_lazy(
+                    "assign_photo_email", kwargs={"email_id": int(kwargs["email_id"])}
+                )
+            )
         email.photo = None
         email.save()