saintbyte
diff --git a/‎telegram/ext/dispatcher.py‎
Lines changed: 2 additions & 2 deletions b/‎telegram/ext/dispatcher.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/conftest.py‎
Lines changed: 1 addition & 0 deletions b/‎tests/conftest.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎tests/test_persistence.py‎
Lines changed: 16 additions & 1 deletion b/‎tests/test_persistence.py‎
Lines changed: 16 additions & 1 deletion
@@ -30,7 +30,7 @@
 
 from future.builtins import range
 
-from telegram import TelegramError
+from telegram import TelegramError, Update
 from telegram.ext.handler import Handler
 from telegram.utils.promise import Promise
 from telegram.ext import BasePersistence
@@ -299,7 +299,7 @@ def process_update(self, update):
             try:
                 for handler in (x for x in self.handlers[group] if x.check_update(update)):
                     handler.handle_update(update, self)
-                    if self.persistence:
+                    if self.persistence and isinstance(update, Update):
                         if self.persistence.store_chat_data and update.effective_chat.id:
                             chat_id = update.effective_chat.id
                             try:
 
@@ -96,6 +96,7 @@ def dp(_dp):
         _dp.update_queue.get(False)
     _dp.chat_data = defaultdict(dict)
     _dp.user_data = defaultdict(dict)
+    _dp.persistence = None
     _dp.handlers = {}
     _dp.groups = []
     _dp.error_handlers = []
 
@@ -31,7 +31,7 @@
 
 from telegram import Update, Message, User, Chat
 from telegram.ext import BasePersistence, Updater, ConversationHandler, MessageHandler, Filters, \
-    PicklePersistence, CommandHandler, DictPersistence
+    PicklePersistence, CommandHandler, DictPersistence, TypeHandler
 
 
 @pytest.fixture(scope="function")
@@ -201,6 +201,21 @@ def save_user_data(data):
         assert dp.user_data[54321][1] == 'test7'
         assert dp.chat_data[-987654][2] == 'test8'
 
+    def test_persistence_dispatcher_arbitrary_update_types(self, dp, base_persistence, caplog):
+        # Updates used with TypeHandler doesn't necessarily have the proper attributes for
+        # persistence, makes sure it works anyways
+
+        dp.persistence = base_persistence
+
+        class MyUpdate(object):
+            pass
+
+        dp.add_handler(TypeHandler(MyUpdate, lambda *_: None))
+
+        with caplog.at_level(logging.ERROR):
+            dp.process_update(MyUpdate())
+        assert 'An uncaught error was raised while processing the update' not in caplog.text
+
 
 @pytest.fixture(scope='function')
 def pickle_persistence():