diff --git a/web_infrastructure/htpasswd.py b/web_infrastructure/htpasswd.py
index 4a72ea37fec..03cd6a5b253 100644
--- a/web_infrastructure/htpasswd.py
+++ b/web_infrastructure/htpasswd.py
@@ -198,6 +198,30 @@ def main():
     if not passlib_installed:
         module.fail_json(msg="This module requires the passlib Python library")
 
+    # Check file for blank lines in effort to avoid "need more than 1 value to unpack" error.
+    f = open(path, "r")
+    try:
+        lines=f.readlines()
+    finally:
+        f.close
+
+    # If the file gets edited, it returns true, so only edit the file if it has blank lines
+    strip = False
+    for line in lines:
+        if not line.strip():
+            strip = True
+
+    if strip:
+        # If check mode, create a temporary file
+        if check_mode:
+            temp = tempfile.NamedTemporaryFile()
+            path = temp.name
+        f = open(path,"w")
+        try:
+            [f.write(line) for line in lines if line.strip() ]
+        finally:
+            f.close
+
     try:
         if state == 'present':
             (msg, changed) = present(path, username, password, crypt_scheme, create, check_mode)