diff --git a/StudiApp/StudiApp/Models/MarkViewItem.cs b/StudiApp/StudiApp/Models/MarkViewItem.cs
index 71553794b8ac5e98c91a624e379bd2b0d41a9b73..123d347ae1bd651892b4c2a760e17ae7a2ba3818 100644
--- a/StudiApp/StudiApp/Models/MarkViewItem.cs
+++ b/StudiApp/StudiApp/Models/MarkViewItem.cs
@@ -1,4 +1,4 @@
-using SQLite;
+using SQLite;
 using StudiApp.Services.Converters;
 
 namespace StudiApp.Models;
@@ -6,4 +6,4 @@ namespace StudiApp.Models;
 public partial class Mark
 {
 	[Ignore] public string PercentageString => PercentageConverter.ConvertToString(Percentage);
-}
\ No newline at end of file
+}
diff --git a/StudiApp/StudiApp/ViewModels/CoursesOverviewViewModel.cs b/StudiApp/StudiApp/ViewModels/CoursesOverviewViewModel.cs
index 5981c992055e2db1ef1b940294659ef63e0bf6e1..dd34804001bf42a71695661fee75867eaca8c729 100644
--- a/StudiApp/StudiApp/ViewModels/CoursesOverviewViewModel.cs
+++ b/StudiApp/StudiApp/ViewModels/CoursesOverviewViewModel.cs
@@ -50,7 +50,7 @@ public partial class CoursesOverviewViewModel : ObservableObject
 
 	private IEnumerable<Course> GetActiveCourses()
 	{
-		return Courses.Where(course => course.Semester.Id.Equals(_currentSemester.Id));
+		return Courses.Where(course => course.Semester.Id.Equals(_currentSemester?.Id));
 	}
 
 	private string UpdateTitle()