diff --git a/src/gui/dbguielement.py b/src/gui/dbguielement.py
index 63c8e9a15..9c0339f56 100644
--- a/src/gui/dbguielement.py
+++ b/src/gui/dbguielement.py
@@ -85,7 +85,7 @@ class DbGUIElement(object):
         This is done automatically on destruction of the object, but is
         normally needed earlier, calling this method does so.
         Use _change_db method if you need to remove the callbacks because the
-        database has chaned
+        database has changed
         """
         database = self.callman.database
         if database.is_open():
diff --git a/src/gui/dbman.py b/src/gui/dbman.py
index 35d24e2fc..28efe0e21 100644
--- a/src/gui/dbman.py
+++ b/src/gui/dbman.py
@@ -327,12 +327,13 @@ class DbManager(CLIDbManager):
         iter = self.model.get_iter_first()
         while (iter):
             path = self.model.get_path(iter)
-            iter = self.model.iter_next(iter)
             if path == skippath:
-                continue
-            itername = self.model.get_value(iter, NAME_COL)
-            if itername.strip() == name.strip():
-                return True
+                pass
+            else:
+                itername = self.model.get_value(iter, NAME_COL)
+                if itername.strip() == name.strip():
+                    return True
+            iter = self.model.iter_next(iter)
         return False
 
     def run(self):