diff --git a/doc/how_to_introduce_breaking_changes.md b/doc/how_to_introduce_breaking_changes.md
index 839858533ed..df2c4dfecd0 100644
--- a/doc/how_to_introduce_breaking_changes.md
+++ b/doc/how_to_introduce_breaking_changes.md
@@ -319,13 +319,13 @@ This way, the pre-announcement wouldn't be displayed unless running into the bra
 Before you publish the breaking changes, you need to make sure that the announcement is ready for the Upcoming Breaking Change Documentation. To do that, run this command:
 
 ```commandline
-azdev genereate-breaking-change-report
+azdev generate-breaking-change-report
 ```
 
 If your breaking change is not for the next breaking change window, you can see all the announcements by using `--target-version None` like this:
 
 ```commandline
-azdev genereate-breaking-change-report --target-version None
+azdev generate-breaking-change-report --target-version None
 ```
 
 The output should be a JSON object including the pre-announcement you made.
@@ -347,5 +347,5 @@ The Upcoming Breaking Change Documentation includes:
 The documentation is generated through `azdev` tool. You can preview the documentation locally through the following command.
 
 ```commandline
-azdev genereate-breaking-change-report CLI --output-format markdown
+azdev generate-breaking-change-report CLI --output-format markdown
 ```
diff --git a/src/azure-cli/azure/cli/command_modules/acr/custom.py b/src/azure-cli/azure/cli/command_modules/acr/custom.py
index f9826cb474a..a04ca43b904 100644
--- a/src/azure-cli/azure/cli/command_modules/acr/custom.py
+++ b/src/azure-cli/azure/cli/command_modules/acr/custom.py
@@ -355,7 +355,7 @@ def acr_login(cmd,
     _, stderr = p.communicate()
     return_code = p.returncode
 
-    if stderr:
+    if stderr or return_code != 0:  # when docker command process returns non-zero
         if b'error storing credentials' in stderr and b'stub received bad data' in stderr \
            and _check_wincred(login_server):
             # Retry once after disabling wincred