diff --git a/src/tools/sdktool/adddebuggeroperation.cpp b/src/tools/sdktool/adddebuggeroperation.cpp
index 045bfcaf2eb41453b83430f5ab257b36efba3f4b..7c167a5e99ef24ab68eef4e07b94dfcff8be7025 100644
--- a/src/tools/sdktool/adddebuggeroperation.cpp
+++ b/src/tools/sdktool/adddebuggeroperation.cpp
@@ -128,8 +128,19 @@ bool AddDebuggerOperation::setArguments(const QStringList &args)
             m_abis = next.split(QLatin1Char(','));
             continue;
         }
+
+        if (next.isNull())
+            return false;
+        ++i; // skip next;
+
+        KeyValuePair pair(current, next);
+        if (!pair.value.isValid())
+            return false;
+        m_extra << pair;
     }
 
+
+
     if (m_id.isEmpty())
         std::cerr << "No id given for kit." << std::endl << std::endl;
     if (m_displayName.isEmpty())