diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java
index 6b9e2080f..ca43485f7 100644
--- a/src/com/fsck/k9/mail/store/WebDavStore.java
+++ b/src/com/fsck/k9/mail/store/WebDavStore.java
@@ -2232,7 +2232,6 @@ public class WebDavStore extends Store {
      */
     public class DataSet {
         private HashMap<String, HashMap<String, String>> mData = new HashMap<String, HashMap<String, String>>();
-        // private HashMap<String, String> mLostData = new HashMap<String, String>();
         private StringBuilder mUid = new StringBuilder();
         private HashMap<String, String> mTempData = new HashMap<String, String>();
 
@@ -2250,8 +2249,7 @@ public class WebDavStore extends Store {
 
         public void finish() {
             String uid = mUid.toString();
-            if (!uid.equals("") &&
-                    mTempData != null) {
+            if (uid != null && mTempData != null) {
                 mData.put(uid, mTempData);
             } else if (mTempData != null) {
                 /*