From cf8df06f631795ac01017b954b4edf6ea7a2a4b7 Mon Sep 17 00:00:00 2001
From: Alex Root Junior <jroot.junior@gmail.com>
Date: Mon, 2 Jul 2018 00:36:12 +0300
Subject: [PATCH] Fix current state context getter for updates where chat is
 not presented.

---
 aiogram/dispatcher/dispatcher.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/aiogram/dispatcher/dispatcher.py b/aiogram/dispatcher/dispatcher.py
index 2ccb4f78..7f140352 100644
--- a/aiogram/dispatcher/dispatcher.py
+++ b/aiogram/dispatcher/dispatcher.py
@@ -847,9 +847,11 @@ class Dispatcher:
         :return:
         """
         if chat is None:
-            chat = types.Chat.current().id
+            chat_obj = types.Chat.current()
+            chat = chat_obj.id if chat_obj else None
         if user is None:
-            user = types.User.current().id
+            user_obj = types.User.current()
+            user = user_obj.id if user_obj else None
 
         return FSMContext(storage=self.storage, chat=chat, user=user)