diff --git a/src/l10n.py b/src/l10n.py
index c982fc32..3b16f0b6 100644
--- a/src/l10n.py
+++ b/src/l10n.py
@@ -6,9 +6,10 @@ import re
 import sys
 import time
 
-from bmconfigparser import BMConfigParser
 from six.moves import range
 
+from bmconfigparser import BMConfigParser
+
 logger = logging.getLogger('default')
 
 DEFAULT_ENCODING = 'ISO8859-1'
@@ -101,7 +102,7 @@ def formatTimestamp(timestamp=None):
     if timestamp is not None and not isinstance(timestamp, int):
         try:
             timestamp = int(timestamp)
-        except:  # noqa:E722
+        except (ValueError, TypeError):
             timestamp = None
 
     # timestamp can't be less than 0.