diff --git a/src/format/context/input.rs b/src/format/context/input.rs
index e043dd24..19a29b82 100644
--- a/src/format/context/input.rs
+++ b/src/format/context/input.rs
@@ -164,19 +164,14 @@ impl<'a> Iterator for PacketIter<'a> {
     fn next(&mut self) -> Option<<Self as Iterator>::Item> {
         let mut packet = Packet::empty();
 
-        loop {
-            match packet.read(self.context) {
-                Ok(..) => unsafe {
-                    return Some((
-                        Stream::wrap(mem::transmute_copy(&self.context), packet.stream()),
-                        packet,
-                    ));
-                },
-
-                Err(Error::Eof) => return None,
-
-                Err(..) => (),
-            }
+        match packet.read(self.context) {
+            Ok(..) => unsafe {
+                Some((
+                    Stream::wrap(mem::transmute_copy(&self.context), packet.stream()),
+                    packet,
+                ))
+            },
+            Err(..) => None,
         }
     }
 }