diff --git a/src/main/java/ru/randomwalk/twitterservice/config/FirebaseConfig.java b/src/main/java/ru/randomwalk/twitterservice/config/FirebaseConfig.java
index 1338755..21ddaeb 100644
--- a/src/main/java/ru/randomwalk/twitterservice/config/FirebaseConfig.java
+++ b/src/main/java/ru/randomwalk/twitterservice/config/FirebaseConfig.java
@@ -34,6 +34,9 @@ public void initialize() {
 
             FirebaseOptions options = FirebaseOptions.builder()
                     .setCredentials(GoogleCredentials.fromStream(credentialsStream))
+                    .setConnectTimeout(15000)
+                    .setReadTimeout(10000)
+                    .setWriteTimeout(10000)
                     .build();
 
             FirebaseApp.initializeApp(options);
diff --git a/src/main/java/ru/randomwalk/twitterservice/service/impl/NotificationSendingServiceImpl.java b/src/main/java/ru/randomwalk/twitterservice/service/impl/NotificationSendingServiceImpl.java
index 5578c52..c4d6fb2 100644
--- a/src/main/java/ru/randomwalk/twitterservice/service/impl/NotificationSendingServiceImpl.java
+++ b/src/main/java/ru/randomwalk/twitterservice/service/impl/NotificationSendingServiceImpl.java
@@ -14,8 +14,10 @@
 import ru.randomwalk.twitterservice.service.DeviceService;
 
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Executors;
 
@@ -51,13 +53,15 @@ private void sendMessage(Notification notification, Device device, Map<String, S
             Message message = Message.builder()
                     .setNotification(notification)
                     .setToken(device.getDeviceToken())
-                    .putAllData(additionalData)
+                    .putAllData(Objects.requireNonNullElseGet(additionalData, HashMap::new))
                     .build();
             String messageId = FirebaseMessaging.getInstance().send(message);
             log.info("Message {} were sent with id {}", message, messageId);
         } catch (FirebaseMessagingException firebaseException) {
             log.warn("Error sending notification {}", notification, firebaseException);
             expireToken(firebaseException, device);
+        } catch (Exception e) {
+            log.error("Exception in task with virtual thread", e);
         }
     }