diff --git a/README.md b/README.md
index 10affe1..c770670 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,8 @@ TODO (wish list)
 ----------------
 
 * plasmoid helper integration
-* `==` checking to avoid segfaults
-* include security notes / project architecture to about window
+* more tray actions
+* include security notes / project architecture
 * autotests
 
 Links
diff --git a/sources/gui/docs/netctl-gui-dbus-api.html b/sources/gui/docs/netctl-gui-dbus-api.html
index 8dbba4e..67e7047 100644
--- a/sources/gui/docs/netctl-gui-dbus-api.html
+++ b/sources/gui/docs/netctl-gui-dbus-api.html
@@ -83,7 +83,7 @@ th.sub {
   </tr>
   <tr>
     <td>QStringList Settings()</td>
-    <td>current helper settings <code>KEY=VALUE</code></td>
+    <td>current helper settings <code>KEY==VALUE</code></td>
     <td>no</td>
   </tr>
   <tr>
@@ -284,7 +284,7 @@ th.sub {
   </tr>
   <tr>
     <td>QStringList Settings()</td>
-    <td>current application settings <code>KEY=VALUE</code></td>
+    <td>current application settings <code>KEY==VALUE</code></td>
     <td>no</td>
   </tr>
   <tr>
diff --git a/sources/gui/src/mainactions.cpp b/sources/gui/src/mainactions.cpp
index 0bd2154..0255433 100644
--- a/sources/gui/src/mainactions.cpp
+++ b/sources/gui/src/mainactions.cpp
@@ -921,6 +921,7 @@ void MainWindow::profileTabLoadProfile()
                                                    DBUS_HELPER_INTERFACE, QString("Profile"),
                                                    args, true, debug)[0].toStringList();
         for (int i=0; i<settingsList.count(); i++) {
+            if (!settingsList[i].contains(QString("=="))) continue;
             QString key = settingsList[i].split(QString("=="))[0];
             QString value = settingsList[i].split(QString("=="))[1];
             settings[key] = value;
diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp
index fc4323a..df69857 100644
--- a/sources/gui/src/mainwindow.cpp
+++ b/sources/gui/src/mainwindow.cpp
@@ -152,7 +152,7 @@ QStringList MainWindow::printSettings()
 
     QStringList settingsList;
     for (int i=0; i<configuration.keys().count(); i++)
-        settingsList.append(configuration.keys()[i] + QString("=") +
+        settingsList.append(configuration.keys()[i] + QString("==") +
                             configuration[configuration.keys()[i]]);
 
     return settingsList;
diff --git a/sources/helper/src/controladaptor.cpp b/sources/helper/src/controladaptor.cpp
index e0c6517..1813558 100644
--- a/sources/helper/src/controladaptor.cpp
+++ b/sources/helper/src/controladaptor.cpp
@@ -157,6 +157,7 @@ bool ControlAdaptor::Create(const QString profile, const QStringList settingsLis
 {
     QMap<QString, QString> settings;
     for (int i=0; i<settingsList.count(); i++) {
+        if (!settingsList[i].contains(QString("=="))) continue;
         QString key = settingsList[i].split(QString("=="))[0];
         QString value = settingsList[i].split(QString("=="))[1];
         settings[key] = value;
diff --git a/sources/helper/src/netctlhelper.cpp b/sources/helper/src/netctlhelper.cpp
index e2bc687..c0d7808 100644
--- a/sources/helper/src/netctlhelper.cpp
+++ b/sources/helper/src/netctlhelper.cpp
@@ -53,7 +53,7 @@ QStringList NetctlHelper::printSettings()
 
     QStringList settingsList;
     for (int i=0; i<configuration.keys().count(); i++)
-        settingsList.append(configuration.keys()[i] + QString("=") +
+        settingsList.append(configuration.keys()[i] + QString("==") +
                             configuration[configuration.keys()[i]]);
 
     return settingsList;