diff --git a/lib/ansible/modules/network/edgeos/edgeos_config.py b/lib/ansible/modules/network/edgeos/edgeos_config.py
index ae124591f77..6ca11069d6a 100644
--- a/lib/ansible/modules/network/edgeos/edgeos_config.py
+++ b/lib/ansible/modules/network/edgeos/edgeos_config.py
@@ -27,6 +27,9 @@ description:
     in the device configuration.
 notes:
   - Tested against EdgeOS 1.9.7
+  - Setting C(ANSIBLE_PERSISTENT_COMMAND_TIMEOUT) to 30 is recommended since
+    the save command can take longer than the default of 10 seconds on
+    some EdgeOS hardware.
 options:
   lines:
     description:
diff --git a/lib/ansible/modules/network/edgeos/edgeos_facts.py b/lib/ansible/modules/network/edgeos/edgeos_facts.py
index a22b4ac375c..d003854f56d 100644
--- a/lib/ansible/modules/network/edgeos/edgeos_facts.py
+++ b/lib/ansible/modules/network/edgeos/edgeos_facts.py
@@ -170,7 +170,7 @@ class Config(FactsBase):
                              by=str(match.group(3)).strip(),
                              via=str(match.group(4)).strip(),
                              comment=None)
-            else:
+            elif entry:
                 entry['comment'] = line.strip()
 
         self.facts['commits'] = entries