diff --git a/main/cmd_hostname.c b/main/cmd_hostname.c
index dd9894f..882dd44 100644
--- a/main/cmd_hostname.c
+++ b/main/cmd_hostname.c
@@ -46,9 +46,9 @@ void cmd_hostname_register(lora32_cfg_t *lora) {
   size_t hostname_len;
 
   printf("nvs_handle: %d\n\n\n", lorcomm_cfg.nvs_handle);
-  nvs_get_str(lorcomm_cfg.nvs_handle, "hostname", NULL, &hostname_len);
+  esp_err_t err = nvs_get_str(lorcomm_cfg.nvs_handle, "hostname", NULL, &hostname_len);
 
-  if(hostname_len > 0) {
+  if(err == ESP_OK && hostname_len > 0) {
     printf("hostname_len: %d\n", hostname_len);
     lorcomm_cfg.hostname = malloc(hostname_len);
 
@@ -56,7 +56,7 @@ void cmd_hostname_register(lora32_cfg_t *lora) {
     printf("hostname: %s\n", lorcomm_cfg.hostname);
   } else {
     lorcomm_cfg.hostname = malloc(7);
-    memcpy(lorcomm_cfg.hostname, "lorcomm", 7);
+    memcpy(lorcomm_cfg.hostname, "lorcomm\0", 8);
   }
 
   const esp_console_cmd_t hostname_cmd = {