diff --git a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java
index bb92759cc..d1d6f6547 100644
--- a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java
+++ b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefault.java
@@ -125,7 +125,7 @@ private void sendNotification(ExecutionContext context, String topic, Notificati
         try {
             message = mapper.writeValueAsString(notificationToSend);
         } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+            throw new NotificationException("Notification cannot be serialized");
         } finally {
             String finalMessage = message;
             context.getLogger().info(() -> String.format("Sending notification on topic: %s with message: %s", topic, finalMessage));
diff --git a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java
index cc1c7b3af..afda1a9fe 100644
--- a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java
+++ b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/service/NotificationEventServiceDefaultTest.java
@@ -314,7 +314,7 @@ void sendNotificationsJsonError() {
         TelemetryClient telemetryClient = mock(TelemetryClient.class);
         doNothing().when(telemetryClient).trackEvent(anyString(), any(), any());
 
-        assertThrows(RuntimeException.class, () -> notificationServiceDefault.send(context, onboarding, QueueEvent.ADD));
+        assertThrows(NotificationException.class, () -> notificationServiceDefault.send(context, onboarding, QueueEvent.ADD));
     }
 
     private Onboarding createOnboarding() {
diff --git a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/utils/SapNotificationBuilderTest.java b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/utils/SapNotificationBuilderTest.java
index 70bbba934..5e6e6aa42 100644
--- a/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/utils/SapNotificationBuilderTest.java
+++ b/apps/onboarding-functions/src/test/java/it/pagopa/selfcare/onboarding/utils/SapNotificationBuilderTest.java
@@ -263,22 +263,7 @@ void toNotificationToSendForEcWhenPartyRegistryThrowsException() {
         when(registryProxyInstitutionsApi.findInstitutionUsingGET(any(), any(), any()))
                 .thenThrow(new RuntimeException("Error"));
 
-//        NotificationToSend notification = sapNotificationBuilder.buildNotificationToSend(onboarding, token, institution, QueueEvent.ADD);
         assertThrows(RuntimeException.class, () -> sapNotificationBuilder.buildNotificationToSend(onboarding, token, institution, QueueEvent.ADD));
-
-//        assertNotNull(notification);
-//        assertNull(notification.getClosedAt());
-//        assertEquals("ACTIVE", notification.getState());
-//        assertNotEquals(onboarding.getId(), notification.getId());
-//        assertEquals(onboarding.getActivatedAt(), notification.getCreatedAt().toLocalDateTime());
-//        assertEquals(onboarding.getActivatedAt(), notification.getUpdatedAt().toLocalDateTime());
-//        assertNull(notification.getBilling().getTaxCodeInvoicing());
-//        assertNull(notification.getBilling().isPublicServices());
-//        assertNull(notification.getNotificationType());
-//        assertEquals(NotificationType.ADD_INSTITUTE, notification.getType());
-//        assertNull(notification.getBilling().getTaxCodeInvoicing());
-//        assertEquals("taxCodeInvoicing", notification.getInstitution().getTaxCode());
-//        assertNull(notification.getInstitution().getIstatCode());
     }
 
     @Test