diff --git a/AdminWindow.axaml.cs b/AdminWindow.axaml.cs
index dfca7e3..14e96ca 100644
--- a/AdminWindow.axaml.cs
+++ b/AdminWindow.axaml.cs
@@ -97,8 +97,11 @@ public partial class AdminWindow : Window
         TeachersFromAdminWindow teachersFromAdminWindow = new TeachersFromAdminWindow();
         var result = await teachersFromAdminWindow.ShowDialog<List<DisciplineGroupTeacher>>(this);
 
-        dataSourceDisciplineGroupTeachers.AddRange(result);
-        DisplayAll();
+        if (result != null && result.Count > 0)
+        {
+            dataSourceDisciplineGroupTeachers.AddRange(result);
+            DisplayAll();
+        }
     }
     
     private void ButtonCheckDiscipline_OnClick(object? sender, RoutedEventArgs e)
diff --git a/TeachersFromAdminWindow.axaml.cs b/TeachersFromAdminWindow.axaml.cs
index d81f04e..5f6db50 100644
--- a/TeachersFromAdminWindow.axaml.cs
+++ b/TeachersFromAdminWindow.axaml.cs
@@ -28,6 +28,10 @@ public partial class TeachersFromAdminWindow : Window
     
     private void ButtonBack_OnClick(object? sender, RoutedEventArgs e)
     {
+        if (result.DisciplineGroupTeachers == null)
+        {
+            Close();
+        }
         Close(result.DisciplineGroupTeachers);
     }
     
@@ -51,7 +55,7 @@ public partial class TeachersFromAdminWindow : Window
         {
             return;
         }
-        dataSourceTeachers.AddRange(result.Teachers);
+        dataSourceTeachers.AddRange(result.Teachers ?? new List<Teacher>());
         DisplayTeachers();
     }
 }
\ No newline at end of file
diff --git a/bin/Debug/net8.0/kursovaya.dll b/bin/Debug/net8.0/kursovaya.dll
index a1cb6fa..ae03862 100644
Binary files a/bin/Debug/net8.0/kursovaya.dll and b/bin/Debug/net8.0/kursovaya.dll differ
diff --git a/bin/Debug/net8.0/kursovaya.pdb b/bin/Debug/net8.0/kursovaya.pdb
index de98d43..a103016 100644
Binary files a/bin/Debug/net8.0/kursovaya.pdb and b/bin/Debug/net8.0/kursovaya.pdb differ
diff --git a/obj/Debug/net8.0/Avalonia/kursovaya.dll b/obj/Debug/net8.0/Avalonia/kursovaya.dll
index a1cb6fa..ae03862 100644
Binary files a/obj/Debug/net8.0/Avalonia/kursovaya.dll and b/obj/Debug/net8.0/Avalonia/kursovaya.dll differ
diff --git a/obj/Debug/net8.0/Avalonia/kursovaya.pdb b/obj/Debug/net8.0/Avalonia/kursovaya.pdb
index de98d43..a103016 100644
Binary files a/obj/Debug/net8.0/Avalonia/kursovaya.pdb and b/obj/Debug/net8.0/Avalonia/kursovaya.pdb differ
diff --git a/obj/Debug/net8.0/kursovaya.AssemblyInfo.cs b/obj/Debug/net8.0/kursovaya.AssemblyInfo.cs
index 7ab186c..8f92965 100644
--- a/obj/Debug/net8.0/kursovaya.AssemblyInfo.cs
+++ b/obj/Debug/net8.0/kursovaya.AssemblyInfo.cs
@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("kursovaya")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d7abb5ffd689ebecb45a3eaa84e87dfd90e6d9f7")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+174854d4ba6a0a72f77efa227a5fba05ab27d5ea")]
 [assembly: System.Reflection.AssemblyProductAttribute("kursovaya")]
 [assembly: System.Reflection.AssemblyTitleAttribute("kursovaya")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/net8.0/kursovaya.AssemblyInfoInputs.cache b/obj/Debug/net8.0/kursovaya.AssemblyInfoInputs.cache
index bedfe59..0faf9a9 100644
--- a/obj/Debug/net8.0/kursovaya.AssemblyInfoInputs.cache
+++ b/obj/Debug/net8.0/kursovaya.AssemblyInfoInputs.cache
@@ -1 +1 @@
-56b533d6bc40151d11e8da76022af04036771e41ff8ddd0fbff74168ace28e08
+266de39eafce47d0cb23e5249264d18024e4509a623c2cf2b322e5b0250b8541
diff --git a/obj/Debug/net8.0/kursovaya.dll b/obj/Debug/net8.0/kursovaya.dll
index d4701cf..7d05a08 100644
Binary files a/obj/Debug/net8.0/kursovaya.dll and b/obj/Debug/net8.0/kursovaya.dll differ
diff --git a/obj/Debug/net8.0/kursovaya.pdb b/obj/Debug/net8.0/kursovaya.pdb
index 9392706..45ab5b5 100644
Binary files a/obj/Debug/net8.0/kursovaya.pdb and b/obj/Debug/net8.0/kursovaya.pdb differ
diff --git a/obj/Debug/net8.0/ref/kursovaya.dll b/obj/Debug/net8.0/ref/kursovaya.dll
index 95a46eb..b8025b2 100644
Binary files a/obj/Debug/net8.0/ref/kursovaya.dll and b/obj/Debug/net8.0/ref/kursovaya.dll differ
diff --git a/obj/Debug/net8.0/refint/Avalonia/kursovaya.dll b/obj/Debug/net8.0/refint/Avalonia/kursovaya.dll
index 95a46eb..b8025b2 100644
Binary files a/obj/Debug/net8.0/refint/Avalonia/kursovaya.dll and b/obj/Debug/net8.0/refint/Avalonia/kursovaya.dll differ
diff --git a/obj/Debug/net8.0/refint/kursovaya.dll b/obj/Debug/net8.0/refint/kursovaya.dll
index 76471aa..27c2d59 100644
Binary files a/obj/Debug/net8.0/refint/kursovaya.dll and b/obj/Debug/net8.0/refint/kursovaya.dll differ