diff --git a/src/DataStore/ChatDataStore.cpp b/src/DataStore/ChatDataStore.cpp
index d3a79e4..4dfc605 100644
--- a/src/DataStore/ChatDataStore.cpp
+++ b/src/DataStore/ChatDataStore.cpp
@@ -37,6 +37,42 @@ std::map<QString, ChatItem> ChatDataStore::getAllRawChatItems()
     return this->data;
 }
 
+std::map<QString, ChatItem> ChatDataStore::getAllContactRequests()
+{
+    std::map<QString, ChatItem> filteredItems;
+    for(auto &c: this->data)
+    {
+        if (
+            (c.second.getType() == "cont") && 
+            (c.second.isOutgoing() == false) && 
+            (c.second.getMemo().startsWith("{"))
+        ) 
+        {
+            filteredItems[c.first] = c.second;
+        }
+    }
+    return filteredItems;
+}
+
+
+std::map<QString, ChatItem> ChatDataStore::getAllMemos()
+{
+    std::map<QString, ChatItem> filteredItems;
+    for(auto &c: this->data)
+    {
+        if (
+
+            (c.second.getMemo().startsWith("{") == false) &&
+            (c.second.getMemo().isEmpty() == false) 
+               
+        ) 
+        {
+            filteredItems[c.first] = c.second;
+        }
+    }
+    return filteredItems;
+}
+
 
 ChatDataStore* ChatDataStore::instance = nullptr;
 bool ChatDataStore::instanced = false;
\ No newline at end of file
diff --git a/src/DataStore/ChatDataStore.h b/src/DataStore/ChatDataStore.h
index 85fd4b9..444c704 100644
--- a/src/DataStore/ChatDataStore.h
+++ b/src/DataStore/ChatDataStore.h
@@ -8,6 +8,8 @@ class ChatDataStore
     private:
         static bool instanced;
         static ChatDataStore* instance;
+        Ui::MainWindow*             ui;
+        MainWindow*                 main;
         std::map<QString, ChatItem> data;
         ChatDataStore()
         {
@@ -20,6 +22,8 @@ class ChatDataStore
         void setData(QString key, ChatItem value);
         ChatItem getData(QString key);
         std::map<QString, ChatItem> getAllRawChatItems();
+        std::map<QString, ChatItem> getAllContactRequests();
+        std::map<QString, ChatItem> getAllMemos();
         QString dump();
 
         ~ChatDataStore()
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index 6f80f37..41fbb2e 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -107,13 +107,20 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
         //    ui->lcdNumber->setPalette(Qt::red);
         //    ui->lcdNumber->display("1");
 
-        for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems())//this->chatItems)
+
+        
+        
         for (auto &p : AddressBook::getInstance()->getAllAddressLabels())
-    {
+        for (auto &c : DataStore::getChatDataStore()->getAllMemos())
+        {
         //////Render only Memos for selected contacts. Do not render empty Memos //// Render only memos where cid=cid
 
         
-            if ((c.second.getContact() == ui->contactNameMemo->text().trimmed()) && (p.getPartnerAddress() == c.second.getAddress()) && (c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false) && (c.second.isOutgoing() == true))
+            if (
+                (c.second.getContact() == ui->contactNameMemo->text().trimmed()) &&
+                (p.getPartnerAddress() == c.second.getAddress()) &&
+                (c.second.isOutgoing() == true)
+                )
              {
         
             QStandardItem* Items = new QStandardItem(c.second.toChatLine());
@@ -126,8 +133,13 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
             ui->listChat->setModel(chat);
 
         }
-
-            if ((c.second.getContact() == ui->contactNameMemo->text().trimmed()) && ((p.getMyAddress() == c.second.getAddress()) && c.second.getMemo().startsWith("{") == false) && (c.second.getMemo().isEmpty() == false) && (c.second.isOutgoing() == false))
+        
+            if (
+            (c.second.getContact() == ui->contactNameMemo->text().trimmed()) && 
+            (p.getMyAddress() == c.second.getAddress()) &&
+            (c.second.isOutgoing() == false)
+            )
+            
         {
 
             QStandardItem* Items1 = new QStandardItem(c.second.toChatLine());
@@ -140,11 +152,13 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view)
 
             ui->listChat->setModel(chat);
         }
+
+        } 
+    
+     
+}    
     
 
-    }       
-    
-}
 
 void MainWindow::renderContactRequest(){
 
@@ -153,35 +167,18 @@ void MainWindow::renderContactRequest(){
         requestContact.setupUi(&dialog);
         Settings::saveRestore(&dialog);
 
-      {
-        QStandardItemModel* contactRequest = new QStandardItemModel();
+       QStandardItemModel* contactRequest = new QStandardItemModel();
 
-            
-            for (auto &c : DataStore::getChatDataStore()->getAllRawChatItems())//this->chatItems)
-          {
-                
-            if ((c.second.getType() == "cont") && (c.second.isOutgoing() == false) && (c.second.getMemo().startsWith("{"))) {
+    {
+            for (auto &c : DataStore::getChatDataStore()->getAllContactRequests())
+            {
 
-
-                 
-
-
-           
-            QStandardItem* Items = new QStandardItem(c.second.getAddress());
-            contactRequest->appendRow(Items);
-            requestContact.requestContact->setModel(contactRequest);   
-            requestContact.requestContact->show();
-      
-       
-                    }
-
-                   
-           }
-
-
-           }
-
-        
+                QStandardItem* Items = new QStandardItem(c.second.getAddress());
+                contactRequest->appendRow(Items);
+                requestContact.requestContact->setModel(contactRequest);
+                requestContact.requestContact->show();
+            }
+        }
 
         QObject::connect(requestContact.requestContact, &QTableView::clicked, [&] () {
 
@@ -220,12 +217,33 @@ void MainWindow::renderContactRequest(){
 
             QString avatar = QString(":/icons/res/") + requestContact.comboBoxAvatar->currentText() + QString(".png");
 
+             if (addr.isEmpty() || newLabel.isEmpty()) 
+        {
+             QMessageBox::critical(
+                this, 
+                QObject::tr("Address or Label Error"), 
+                QObject::tr("Address or Label cannot be empty"), 
+                QMessageBox::Ok
+                );
+            return;
+        }
+
+        // Test if address is valid.
+        if (!Settings::isValidAddress(addr)) 
+        {
+          QMessageBox::critical(
+                this, 
+                QObject::tr("Address Format Error"), 
+                QObject::tr("%1 doesn't seem to be a valid hush address.").arg(addr), 
+                QMessageBox::Ok
+            );
+            return;
+        } 
+
                 qDebug()<<"Beginn kopiert" <<cid << addr << newLabel << myAddr;
                 AddressBook::getInstance()->addAddressLabel(newLabel, addr, myAddr, cid, avatar);
 
-                  QMessageBox::information(this, "Added Contact","successfully added your new contact. You can now Chat with this contact");
-               
-          
+                  QMessageBox::information(this, "Added Contact","successfully added your new contact. You can now Chat with this contact");      
             
     });