diff --git a/autotests/contactgrouptest.cpp b/autotests/contactgrouptest.cpp
--- a/autotests/contactgrouptest.cpp
+++ b/autotests/contactgrouptest.cpp
@@ -102,10 +102,10 @@
         ref.insertCustom(customKey, customValue);
 
         const ContactGroup::ContactReference constRef(ref);
-        constRef.uid();
-        constRef.preferredEmail();
-        constRef.custom(customKey);
-        constRef.gid();
+        QCOMPARE(constRef.uid(), uid);
+        QCOMPARE(constRef.preferredEmail(), preferredEMail);
+        QCOMPARE(constRef.custom(customKey), customValue);
+        QVERIFY(constRef.gid().isEmpty());
     }
 }
 
@@ -216,9 +216,9 @@
         data.insertCustom(customKey, customValue);
 
         const ContactGroup::Data constData(data);
-        constData.name();
-        constData.email();
-        constData.custom(customKey);
+        QCOMPARE(constData.name(), name);
+        QCOMPARE(constData.email(), email);
+        QCOMPARE(constData.custom(customKey), customValue);
     }
 }
 
diff --git a/autotests/ldifconvertertest.h b/autotests/ldifconvertertest.h
--- a/autotests/ldifconvertertest.h
+++ b/autotests/ldifconvertertest.h
@@ -54,6 +54,9 @@
     void shouldExportWorkStreet();
     void shouldExportMultiEmails();
     void shouldExportFullName();
+
+    //Garbage tests
+    void testGarbage();
 };
 
 #endif // LDIFCONVERTERTEST_H
diff --git a/autotests/ldifconvertertest.cpp b/autotests/ldifconvertertest.cpp
--- a/autotests/ldifconvertertest.cpp
+++ b/autotests/ldifconvertertest.cpp
@@ -545,4 +545,23 @@
     QCOMPARE(str, expected);
 }
 
+void LDifConverterTest::testGarbage()
+{
+    AddresseeList lst;
+    ContactGroup::List contactGroup;
+    QString str;
+    bool result;
+
+    result = LDIFConverter::addresseeAndContactGroupToLDIF(lst, contactGroup, str);
+    QVERIFY(!result);
+    result = LDIFConverter::contactGroupToLDIF(contactGroup, str);
+    QVERIFY(!result);
+    result = LDIFConverter::addresseeToLDIF(lst, str);
+    QVERIFY(!result);
+
+    Addressee addr;
+    result = LDIFConverter::addresseeToLDIF(addr, str);
+    QVERIFY(!result);
+}
+
 QTEST_MAIN(LDifConverterTest)
diff --git a/autotests/picturetest.cpp b/autotests/picturetest.cpp
--- a/autotests/picturetest.cpp
+++ b/autotests/picturetest.cpp
@@ -121,7 +121,7 @@
     QVERIFY(picture1 == picture2);
 
     // access rawData() so a QByteArray is created
-    picture1.rawData();
+    QVERIFY(!picture1.rawData().isNull());
     QVERIFY(picture1 == picture2);
 }
 
@@ -136,7 +136,7 @@
     QVERIFY(picture1 == picture2);
 
     // access data() so a QImage is created
-    picture1.data();
+    QVERIFY(!picture1.data().isNull());
     QVERIFY(picture1 == picture2);
 }
 
diff --git a/src/converter/ldifconverter.cpp b/src/converter/ldifconverter.cpp
--- a/src/converter/ldifconverter.cpp
+++ b/src/converter/ldifconverter.cpp
@@ -84,7 +84,7 @@
 {
     bool result = addresseeToLDIF(addrList, str);
     if (!contactGroupList.isEmpty()) {
-        result = contactGroupToLDIF(contactGroupList, str);
+        result = (contactGroupToLDIF(contactGroupList, str) || result); //order matters
     }
     return result;
 }
@@ -111,22 +111,32 @@
 
 bool LDIFConverter::contactGroupToLDIF(const ContactGroup::List &contactGroupList, QString &str)
 {
+    if (contactGroupList.count() <= 0) {
+        return false;
+    }
+
+    bool result = true;
     ContactGroup::List::ConstIterator it;
     const ContactGroup::List::ConstIterator end(contactGroupList.constEnd());
     for (it = contactGroupList.constBegin(); it != end; ++it) {
-        contactGroupToLDIF(*it, str);
+        result = (contactGroupToLDIF(*it, str) || result); //order matters
     }
-    return true;
+    return result;
 }
 
 bool LDIFConverter::addresseeToLDIF(const AddresseeList &addrList, QString &str)
 {
+    if (addrList.count() <= 0) {
+        return false;
+    }
+
+    bool result = true;
     AddresseeList::ConstIterator it;
     const AddresseeList::ConstIterator end(addrList.constEnd());
     for (it = addrList.constBegin(); it != end; ++it) {
-        addresseeToLDIF(*it, str);
+        result = (addresseeToLDIF(*it, str) || result); //order matters
     }
-    return true;
+    return result;
 }
 
 bool LDIFConverter::addresseeToLDIF(const Addressee &addr, QString &str)