diff --git a/png/png.py b/png/png.py
index 83421b26..9e71b7e6 100644
--- a/png/png.py
+++ b/png/png.py
@@ -325,9 +325,16 @@ def peekiter(iterable):
 
     def gen():
         """Generator that returns first and proxy other items from source"""
-        yield one
+        try:
+            yield one
+        except StopIteration:
+            return
+
         while True:
-            yield next(it)
+            try:
+                yield next(it)
+            except StopIteration:
+                break
     return (one, gen())