diff --git a/resources/lib/dropbox/stone_serializers.py b/resources/lib/dropbox/stone_serializers.py
index 3622dbc..faf1b6a 100644
--- a/resources/lib/dropbox/stone_serializers.py
+++ b/resources/lib/dropbox/stone_serializers.py
@@ -880,6 +880,12 @@ class PythonPrimitiveToStoneDecoder(object):
         if isinstance(data_type, bv.Timestamp):
             try:
                 ret = datetime.datetime.strptime(val, data_type.format)
+            except:
+                #datetime.datetime.strptime(val, data_type.format) returned NoneType. Trying alterntive
+                pass
+            
+            try:
+                ret = datetime.datetime(*(time.strptime(val, data_type.format)[0:6]))
             except (TypeError, ValueError) as e:
                 raise bv.ValidationError(e.args[0])
         elif isinstance(data_type, bv.Bytes):