diff --git a/src/main/kotlin/fr/dcproject/component/notification/push/NotificationPushListener.kt b/src/main/kotlin/fr/dcproject/component/notification/push/NotificationPushListener.kt
index 808e11b..96b77b0 100644
--- a/src/main/kotlin/fr/dcproject/component/notification/push/NotificationPushListener.kt
+++ b/src/main/kotlin/fr/dcproject/component/notification/push/NotificationPushListener.kt
@@ -42,9 +42,9 @@ class NotificationPushListener(
     onReceive: suspend (NotificationMessage) -> Unit,
 ) {
     class Builder(redisClient: RedisClient) {
-        private val redisConnection = redisClient.connect() ?: error("Unable to connect to redis")
-        private val redisConnectionPubSub = redisClient.connectPubSub() ?: error("Unable to connect to redis PubSub")
-        private val redis: RedisAsyncCommands<String, String> = redisConnection.async() ?: error("Unable to connect to redis Async")
+        private val redisConnection = redisClient.connect()
+        private val redisConnectionPubSub = redisClient.connectPubSub()
+        private val redis: RedisAsyncCommands<String, String> = redisConnection.async()
 
         /**
          * Build Listener with citizen, incoming flow and set an outgoing callback
@@ -62,7 +62,7 @@ class NotificationPushListener(
         fun build(ws: DefaultWebSocketServerSession): NotificationPushListener {
             /* Convert channel of string from websocket, to a flow of Notification object */
             val incomingFlow: Flow<NotificationMessage> = ws.incoming.consumeAsFlow()
-                .mapNotNull<Frame, Text> { it as? Frame.Text }
+                .mapNotNull<Frame, Text> { it as? Text }
                 .map { it.readText() }
                 .map { NotificationMessage.fromString(it) }
 
@@ -119,7 +119,7 @@ class NotificationPushListener(
             addListener(listener)
 
             /* Register to the events */
-            async()?.psubscribe("__key*__:$key") ?: error("Unable to subscribe to redis events")
+            async()?.psubscribe("__key*__:$key")
         }
     }