diff --git a/src/BCards.Web/Middleware/AuthCacheMiddleware.cs b/src/BCards.Web/Middleware/AuthCacheMiddleware.cs
index 387557f..d74b360 100644
--- a/src/BCards.Web/Middleware/AuthCacheMiddleware.cs
+++ b/src/BCards.Web/Middleware/AuthCacheMiddleware.cs
@@ -23,6 +23,14 @@ namespace BCards.Web.Middleware
         {
             await _next(context);
 
+            // Verificar se a resposta já começou antes de modificar headers
+            if (context.Response.HasStarted)
+            {
+                _logger.LogDebug("AuthCache: Response already started, skipping header modifications for {Path}", 
+                    context.Request.Path.Value);
+                return;
+            }
+
             // Aplicar headers apenas para páginas HTML (não APIs, imagens, etc)
             if (context.Response.ContentType?.StartsWith("text/html") == true)
             {
diff --git a/src/BCards.Web/Views/Admin/ManagePage.cshtml b/src/BCards.Web/Views/Admin/ManagePage.cshtml
index e952437..65c435f 100644
--- a/src/BCards.Web/Views/Admin/ManagePage.cshtml
+++ b/src/BCards.Web/Views/Admin/ManagePage.cshtml
@@ -248,7 +248,9 @@
                                                     "twitter",
                                                     "instagram"
                                                 };
-                                                var match = myList.FirstOrDefault(stringToCheck => Model.Links[i].Icon.Contains(stringToCheck));
+                                                var match = myList.FirstOrDefault(stringToCheck => 
+                                                    !string.IsNullOrEmpty(Model.Links[i].Icon) && 
+                                                    Model.Links[i].Icon.Contains(stringToCheck));
                                                 if (match==null) 
                                                 {
                                                     if (Model.Links[i].Type==LinkType.Normal) 
@@ -372,10 +374,10 @@
                                 </div>
                             </div>
                             @{
-                                var facebook = Model.Links.Where(x => x.Icon.Contains("facebook")).FirstOrDefault();
-                                var twitter = Model.Links.Where(x => x.Icon.Contains("twitter")).FirstOrDefault();
-                                var whatsapp = Model.Links.Where(x => x.Icon.Contains("whatsapp")).FirstOrDefault();
-                                var instagram = Model.Links.Where(x => x.Icon.Contains("instagram")).FirstOrDefault();
+                                var facebook = Model.Links.Where(x => !string.IsNullOrEmpty(x.Icon) && x.Icon.Contains("facebook")).FirstOrDefault();
+                                var twitter = Model.Links.Where(x => !string.IsNullOrEmpty(x.Icon) && x.Icon.Contains("twitter")).FirstOrDefault();
+                                var whatsapp = Model.Links.Where(x => !string.IsNullOrEmpty(x.Icon) && x.Icon.Contains("whatsapp")).FirstOrDefault();
+                                var instagram = Model.Links.Where(x => !string.IsNullOrEmpty(x.Icon) && x.Icon.Contains("instagram")).FirstOrDefault();
                                 var facebookUrl = facebook !=null ? facebook.Url : "";
                                 var twitterUrl = twitter !=null ? twitter.Url : "";
                                 var whatsappUrl = whatsapp !=null ? whatsapp.Url.Replace("https://wa.me/","") : "";