diff --git a/pokedex/db/translations.py b/pokedex/db/translations.py
index 8f55473..67c793a 100755
--- a/pokedex/db/translations.py
+++ b/pokedex/db/translations.py
@@ -377,7 +377,10 @@ def group_by_object(stream):
     Yields ((class name, object ID), (list of messages)) pairs.
     """
     stream = iter(stream)
-    current = next(stream)
+    try:
+        current = next(stream)
+    except StopIteration:
+        yield StopIteration
     current_key = current.cls, current.id
     group = [current]
     for message in stream: