diff --git a/src/lib.rs b/src/lib.rs
index cafca07..3f8376c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -736,11 +736,11 @@ impl Parser {
                         // Jan-01[-99]
                         let sep = &l[i + 1];
                         // TODO: This seems like a very unsafe unwrap
-                        ymd.append(l[i + 2].parse::<i32>().unwrap(), &l[i + 2], None)?;
+                        ymd.append(l[i + 2].parse::<i32>()?, &l[i + 2], None)?;
 
                         if i + 3 < len_l && &l[i + 3] == sep {
                             // Jan-01-99
-                            ymd.append(l[i + 4].parse::<i32>().unwrap(), &l[i + 4], None)?;
+                            ymd.append(l[i + 4].parse::<i32>()?, &l[i + 4], None)?;
                             i += 2;
                         }
 
@@ -803,17 +803,17 @@ impl Parser {
                 // TODO: check that l[i + 1] is integer?
                 if len_li == 4 {
                     // -0300
-                    hour_offset = Some(l[i + 1][..2].parse::<i32>().unwrap());
-                    min_offset = Some(l[i + 1][2..4].parse::<i32>().unwrap());
+                    hour_offset = Some(l[i + 1][..2].parse::<i32>()?);
+                    min_offset = Some(l[i + 1][2..4].parse::<i32>()?);
                 } else if i + 2 < len_l && l[i + 2] == ":" {
                     // -03:00
-                    hour_offset = Some(l[i + 1].parse::<i32>().unwrap());
-                    min_offset = Some(l[i + 3].parse::<i32>().unwrap());
+                    hour_offset = Some(l[i + 1].parse::<i32>()?);
+                    min_offset = Some(l[i + 3].parse::<i32>()?);
                     i += 2;
                 } else if len_li <= 2 {
                     // -[0]3
                     let range_len = min(l[i + 1].len(), 2);
-                    hour_offset = Some(l[i + 1][..range_len].parse::<i32>().unwrap());
+                    hour_offset = Some(l[i + 1][..range_len].parse::<i32>()?);
                     min_offset = Some(0);
                 }
 
@@ -1017,9 +1017,9 @@ impl Parser {
             let s = &tokens[idx];
 
             if ymd.len() == 0 && tokens[idx].find('.') == None {
-                ymd.append(s[0..2].parse::<i32>().unwrap(), &s[0..2], None)?;
-                ymd.append(s[2..4].parse::<i32>().unwrap(), &s[2..4], None)?;
-                ymd.append(s[4..6].parse::<i32>().unwrap(), &s[4..6], None)?;
+                ymd.append(s[0..2].parse::<i32>()?, &s[0..2], None)?;
+                ymd.append(s[2..4].parse::<i32>()?, &s[2..4], None)?;
+                ymd.append(s[4..6].parse::<i32>()?, &s[4..6], None)?;
             } else {
                 // 19990101T235959[.59]
                 res.hour = s[0..2].parse::<i32>().ok();
@@ -1033,12 +1033,12 @@ impl Parser {
             // YYMMDD
             let s = &tokens[idx];
             ymd.append(
-                s[..4].parse::<i32>().unwrap(),
+                s[..4].parse::<i32>()?,
                 &s[..4],
                 Some(YMDLabel::Year),
             )?;
-            ymd.append(s[4..6].parse::<i32>().unwrap(), &s[4..6], None)?;
-            ymd.append(s[6..8].parse::<i32>().unwrap(), &s[6..8], None)?;
+            ymd.append(s[4..6].parse::<i32>()?, &s[4..6], None)?;
+            ymd.append(s[6..8].parse::<i32>()?, &s[6..8], None)?;
 
             if len_li > 8 {
                 res.hour = Some(s[8..10].parse::<i32>()?);
@@ -1080,7 +1080,7 @@ impl Parser {
         {
             // TODO: There's got to be a better way of handling the condition above
             let sep = &tokens[idx + 1];
-            ymd.append(value_repr.parse::<i32>().unwrap(), &value_repr, None)?;
+            ymd.append(value_repr.parse::<i32>()?, &value_repr, None)?;
 
             if idx + 2 < len_l && !info.jump_index(&tokens[idx + 2]) {
                 if let Ok(val) = tokens[idx + 2].parse::<i32>() {
diff --git a/src/tests/fuzzing.rs b/src/tests/fuzzing.rs
index d9ca04c..e0695c5 100644
--- a/src/tests/fuzzing.rs
+++ b/src/tests/fuzzing.rs
@@ -40,3 +40,10 @@ fn test_fuzz() {
         Err(ParseError::ImpossibleTimestamp("Invalid minute"))
     );
 }
+
+#[test]
+fn large_int() {
+    let parse_result = parse("1412409095009.jpg");
+    assert!(parse_result.is_err());
+    println!("{:?}", parse_result);
+}
\ No newline at end of file