diff --git a/TajikGanjoor/Pages/Index.cshtml.cs b/TajikGanjoor/Pages/Index.cshtml.cs
index 94622559..25754060 100644
--- a/TajikGanjoor/Pages/Index.cshtml.cs
+++ b/TajikGanjoor/Pages/Index.cshtml.cs
@@ -41,14 +41,16 @@ namespace TajikGanjoor.Pages
                         return false;
                     }
                     poets = JArray.Parse(await response.Content.ReadAsStringAsync()).ToObject<List<GanjoorPoetViewModel>>();
+                    poets = poets ?? [];
+                    poets = poets.Where(p => !string.IsNullOrWhiteSpace(p.TajikNickName)).ToList();
                     if (AggressiveCacheEnabled)
                     {
                         _memoryCache.Set(cacheKey, poets);
                     }
                 }
-                catch
+                catch(Exception e)
                 {
-                    LastError = "خطا در دسترسی به وب سرویس گنجور";
+                    LastError = $"خطا در دسترسی به وب سرویس گنجور - {e}";
                     return false;
                 }
 
diff --git a/TajikGanjoor/Program.cs b/TajikGanjoor/Program.cs
index 45bfa1aa..4bd42073 100644
--- a/TajikGanjoor/Program.cs
+++ b/TajikGanjoor/Program.cs
@@ -5,7 +5,7 @@ var builder = WebApplication.CreateBuilder(args);
 
 builder.Services.AddSingleton(
                  HtmlEncoder.Create(allowedRanges: [ UnicodeRanges.BasicLatin,
-                    UnicodeRanges.Arabic ]));
+                    UnicodeRanges.Arabic, UnicodeRanges.Cyrillic ]));
 
 builder.Services.AddRazorPages(options =>
 {