diff --git a/flask_security/utils.py b/flask_security/utils.py
index ec85ab5..336bb0d 100644
--- a/flask_security/utils.py
+++ b/flask_security/utils.py
@@ -315,10 +315,10 @@ def get_token_status(token, serializer, max_age=None):
         expired = True
     except BadSignature:
         invalid = True
-    except TypeError:
-        invalid = True
-    except ValueError:
-        invalid = True
+#    except TypeError:
+#        invalid = True
+#    except ValueError:
+#        invalid = True
 
     if data:
         user = _datastore.find_user(id=data[0])
diff --git a/tests/configured_tests.py b/tests/configured_tests.py
index 0324ecf..cc59011 100644
--- a/tests/configured_tests.py
+++ b/tests/configured_tests.py
@@ -432,7 +432,8 @@ class RecoverableTests(SecurityTest):
             'password_confirm': 'newpassword'
         }, follow_redirects=True)
 
-        self.assertIn(self.get_message('INVALID_RESET_PASSWORD_TOKEN'), r.data)
+        m = self.get_message('INVALID_RESET_PASSWORD_TOKEN')
+        self.assertIn(m.encode('utf-8'), r.data)
 
 
 class ExpiredResetPasswordTest(SecurityTest):