diff --git a/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs b/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs
index da6118b..e4dcbc3 100644
--- a/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs
+++ b/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs
@@ -185,7 +185,7 @@ namespace GUTSchedule.Droid.Activities
 
 		private async void UpdateGroupsList()
 		{
-			if (course.SelectedItem == null)
+			if (course.SelectedItem == null || Faculties.Count < 1)
 				return;
 
 			Groups = await Parser.GetGroups(Faculties[faculty.SelectedItemPosition].id, (course.SelectedItemPosition + 1).ToString());
diff --git a/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs b/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs
index 93b81f8..f14c34a 100644
--- a/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs
+++ b/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs
@@ -12,7 +12,8 @@ namespace GUTSchedule.Test
 		{
 			var list = await Parser.GetFaculties();
 			Assert.IsNotNull(list);
-			Assert.IsTrue(list.Count > 0);
+			if (list.Count < 1)
+				Assert.Warn("No faculties available");
 
 			Console.WriteLine("Faculties list:");
 			list.ForEach(i =>
diff --git a/changelogs/android/en-IN/changelogs/android-changelog.txt b/changelogs/android/en-IN/changelogs/android-changelog.txt
index 0106204..cd03071 100644
--- a/changelogs/android/en-IN/changelogs/android-changelog.txt
+++ b/changelogs/android/en-IN/changelogs/android-changelog.txt
@@ -1 +1 @@
-- Updated schedule parser
\ No newline at end of file
+- Fixed application crashes when there is no public schedule available
\ No newline at end of file
diff --git a/changelogs/android/ru-RU/changelogs/android-changelog.txt b/changelogs/android/ru-RU/changelogs/android-changelog.txt
index 12b873e..0d54a6b 100644
--- a/changelogs/android/ru-RU/changelogs/android-changelog.txt
+++ b/changelogs/android/ru-RU/changelogs/android-changelog.txt
@@ -1 +1 @@
-- Обновлен парсер расписания
\ No newline at end of file
+- Исправлены вылеты, когда нет публичного расписания
\ No newline at end of file
diff --git a/changelogs/github.md b/changelogs/github.md
index 3703230..09caba4 100644
--- a/changelogs/github.md
+++ b/changelogs/github.md
@@ -1,2 +1,2 @@
-## Core
-- Updated schedule parser
\ No newline at end of file
+## Android
+- Fixed application crashes when there is no public schedule available
\ No newline at end of file