diff --git a/taglib/toolkit/tmap.tcc b/taglib/toolkit/tmap.tcc
index e2755d6f..765df50e 100644
--- a/taglib/toolkit/tmap.tcc
+++ b/taglib/toolkit/tmap.tcc
@@ -134,7 +134,9 @@ template <class Key, class T>
 Map<Key, T> &Map<Key,T>::erase(const Key &key)
 {
   detach();
-  d->map.erase(find(key));
+  Iterator it = d->map.find(key);
+  if(it != d->map.end())
+      d->map.erase(it);
   return *this;
 }