2 files changed, 8 insertions, 4 deletions
diff --git a/README.md b/README.md
index 3f67e16b12..f306bd577d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![PyPI version](https://badge.fury.io/py/ansible.svg)](http://badge.fury.io/py/ansible)
-[![PyPI downloads](https://pypip.in/d/ansible/badge.svg)](https://pypi.python.org/pypi/ansible)
+[![PyPI version](https://img.shields.io/pypi/v/ansible.svg)](https://pypi.python.org/pypi/ansible)
+[![PyPI downloads](https://img.shields.io/pypi/dm/ansible.svg)](https://pypi.python.org/pypi/ansible)
 [![Build Status](https://travis-ci.org/ansible/ansible.svg?branch=devel)](https://travis-ci.org/ansible/ansible)
 
 
diff --git a/bin/ansible b/bin/ansible
index 209b235c88..04ec345058 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -36,6 +36,7 @@ import os
 import sys
 import traceback
 
+import ansible.constants as C
 from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
 from ansible.utils.display import Display
 
@@ -103,8 +104,11 @@ if __name__ == '__main__':
     except Exception as e:
         have_cli_options = cli is not None and cli.options is not None
         display.error("Unexpected Exception: %s" % str(e), wrap_text=False)
-        if not have_cli_options or have_cli_options and cli.options.verbosity > 2:
+        if not have_cli_options or have_cli_options and cli.options.verbosity > 2 or C.DEFAULT_DEBUG:
             display.display("the full traceback was:\n\n%s" % traceback.format_exc())
         else:
             display.display("to see the full traceback, use -vvv")
-        sys.exit(250)
+        if C.DEFAULT_DEBUG:
+            raise
+        else:
+            sys.exit(250)