--- a/bookmarks/xbelreader.cpp	Mon Oct 04 14:09:43 2010 -0400
+++ b/bookmarks/xbelreader.cpp	Fri Oct 15 17:29:22 2010 -0400
@@ -141,7 +141,7 @@
     }
 
     int bmID = m_bmgr->addBookmark(title, url);
-    if (bmID > 0) {
+    if (bmID > 0 && tags.size() > 0) {
         QList<QString>::iterator iter;
         for (iter = tags.begin(); iter != tags.end(); ++iter)
             m_bmgr->addTag(bmID, *iter);
@@ -191,9 +191,10 @@
 void XbelReader::readTags(QList<QString>& tags) 
 {
     while(m_xml->readNextStartElement()) {
-        if(m_xml->name() == "tag") 
-            tags.append(m_xml->readElementText());
-        else
+        if(m_xml->name() == "tag") {
+            QString tag = m_xml->readElementText();
+            tags.append(tag);
+        } else
             m_xml->skipCurrentElement();
     }