diff --git a/code/espurna/settings.ino b/code/espurna/settings.ino
index 7bfa928a..b1d4d921 100644
--- a/code/espurna/settings.ino
+++ b/code/espurna/settings.ino
@@ -151,7 +151,7 @@ void _settingsKeysCommand() {
     DEBUG_MSG_P(PSTR("Current settings:\n"));
     for (unsigned int i=0; i<keys.size(); i++) {
         String value = getSetting(keys[i]);
-        DEBUG_MSG_P(PSTR("> %s => %s\n"), (keys[i]).c_str(), value.c_str());
+        DEBUG_MSG_P(PSTR("> %s => \"%s\"\n"), (keys[i]).c_str(), value.c_str());
     }
 
     unsigned long freeEEPROM = SPI_FLASH_SEC_SIZE - settingsSize();
@@ -279,10 +279,11 @@ void _settingsInitCommands() {
             String key = String(e->argv[i]);
             String value;
             if (!Embedis::get(key, value)) {
-                DEBUG_MSG_P(PSTR("-ERROR: Unknown key: %s\n"), key.c_str());
+                DEBUG_MSG_P(PSTR("> %s =>\n"), key.c_str());
+                continue;
             }
 
-            DEBUG_MSG_P(PSTR("> %s => %s\n"), key.c_str(), value.c_str());
+            DEBUG_MSG_P(PSTR("> %s => \"%s\"\n"), key.c_str(), value.c_str());
         }
 
         DEBUG_MSG_P(PSTR("+OK\n"));