diff --git a/taglib/ebml/matroska/ebmlmatroskafile.cpp b/taglib/ebml/matroska/ebmlmatroskafile.cpp
index a43a9783..ad093fdc 100644
--- a/taglib/ebml/matroska/ebmlmatroskafile.cpp
+++ b/taglib/ebml/matroska/ebmlmatroskafile.cpp
@@ -373,6 +373,7 @@ public:
       if(i->second.second == ttv)
         return i;
     }
+    return document->d->tags.end();
   }
   
   // Updates the given information