From 6f904af461aa27479e2143d1d79c8eea333786d2 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Mon, 20 Dec 2021 16:04:32 +0100
Subject: [PATCH] Bugfix

---
 .../session/TelegramLongPollingSessionBot.java            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java b/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java
index 2c6751bb..17253a6d 100644
--- a/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java
+++ b/telegrambots-chat-session-bot/src/main/java/org/telegram/telegrambots/session/TelegramLongPollingSessionBot.java
@@ -54,8 +54,12 @@ public abstract class TelegramLongPollingSessionBot extends TelegramLongPollingB
             onUpdateReceived(update, chatSession);
             return;
         }
-        chatIdConverter.setSessionId(message.getChatId());
-        chatSession = this.getSession(message);
+        if (message.getChat() != null) {
+            chatIdConverter.setSessionId(message.getChatId());
+            chatSession = this.getSession(message);
+        } else {
+            chatSession = Optional.empty();
+        }
         onUpdateReceived(update, chatSession);
     }