diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index 5c48895bf..78e5c422c 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -118,19 +118,19 @@ ConfCertDialog::ConfCertDialog(const RsPeerId& id, const RsPgpId &pgp_id, QWidge
         connect(this, SIGNAL(configChanged()), w->getPage(MainWindow::Network), SLOT(insertConnect()));
     }
 }
-
-ConfCertDialog::~ConfCertDialog()
-{
-    if(peerId.isNull())
-    {
-        QMap<RsPeerId, ConfCertDialog*>::iterator it = instances_ssl.find(peerId);
-        if (it != instances_ssl.end())
-            instances_ssl.erase(it);
-    }
-    else
-    {
-        QMap<RsPgpId, ConfCertDialog*>::iterator it = instances_pgp.find(pgpId);
-        if (it != instances_pgp.end())
+
+ConfCertDialog::~ConfCertDialog()
+{
+//    if(peerId.isNull())
+    {
+        QMap<RsPeerId, ConfCertDialog*>::iterator it = instances_ssl.find(peerId);
+        if (it != instances_ssl.end())
+            instances_ssl.erase(it);
+    }
+//    else
+    {
+        QMap<RsPgpId, ConfCertDialog*>::iterator it = instances_pgp.find(pgpId);
+        if (it != instances_pgp.end())
             instances_pgp.erase(it);
     }
 }
@@ -155,14 +155,12 @@ void ConfCertDialog::loadAll()
 }
 
 void ConfCertDialog::load()
-{
-    RsPeerDetails detail;
-
-    bool ok = false ;
-
-    if(!(rsPeers->getPeerDetails(peerId, detail) || rsPeers->getGPGDetails(pgpId, detail)))
-    {
-        QMessageBox::information(this,
+{
+    RsPeerDetails detail;
+
+    if(!(rsPeers->getPeerDetails(peerId, detail) || rsPeers->getGPGDetails(pgpId, detail)))
+    {
+        QMessageBox::information(this,
                                  tr("RetroShare"),
                                  tr("Error : cannot get peer details."));
         close();