diff --git a/src/main/java/io/github/paexception/engelsburg/api/endpoint/dto/SubstituteDTO.java b/src/main/java/io/github/paexception/engelsburg/api/endpoint/dto/SubstituteDTO.java
index f9beaff..58bd84e 100644
--- a/src/main/java/io/github/paexception/engelsburg/api/endpoint/dto/SubstituteDTO.java
+++ b/src/main/java/io/github/paexception/engelsburg/api/endpoint/dto/SubstituteDTO.java
@@ -48,7 +48,7 @@ public boolean sameBase(SubstituteDTO dto) {
 		if (lesson != dto.lesson) return false;
 		if (!Objects.equals(className, dto.className)) return false;
 
-		if (!Character.isDigit(className.charAt(0))) { //Only for E1 - Q4
+		if (className != null && !Character.isDigit(className.charAt(0))) { //Only for E1 - Q4
 			return Objects.equals(teacher, dto.teacher);
 		}
 
diff --git a/src/main/java/io/github/paexception/engelsburg/api/service/notification/NotificationService.java b/src/main/java/io/github/paexception/engelsburg/api/service/notification/NotificationService.java
index 6a19ea9..e3de7e9 100644
--- a/src/main/java/io/github/paexception/engelsburg/api/service/notification/NotificationService.java
+++ b/src/main/java/io/github/paexception/engelsburg/api/service/notification/NotificationService.java
@@ -129,7 +129,7 @@ private static String getSubstituteTitle(SubstituteNotificationDTO substitute, b
 		} else if (DateUtils.isSameDay(substitute.getDate(), Date.from(Instant.now().plus(Duration.ofDays(1))))) {
 			relationalDay = "morgen";
 		} else {
-			relationalDay = "den " + DateTimeFormatter.ofPattern("dd.MM.").format(substitute.getDate().toInstant());
+			relationalDay = "den " + DateTimeFormatter.ofPattern("dd.MM.").format(substitute.getDate().toLocalDate());
 		}
 
 		return actuality + " Vertretung für " + relationalDay;