From 4b1a04e5ed0c19e30f984ea379658cf9c6acd3e4 Mon Sep 17 00:00:00 2001
From: Jakub Roztocil <jakub@roztocil.name>
Date: Thu, 2 Aug 2012 04:33:43 +0200
Subject: [PATCH] Fixed error handling.

---
 httpie/core.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/httpie/core.py b/httpie/core.py
index b00d896e..a19810ce 100644
--- a/httpie/core.py
+++ b/httpie/core.py
@@ -143,6 +143,7 @@ def main(args=sys.argv[1:], env=Environment()):
     Return exit status.
 
     """
+    debug = '--debug' in args
 
     if env.is_windows and not env.stdout_isatty:
         env.stderr.write(
@@ -178,9 +179,9 @@ def main(args=sys.argv[1:], env=Environment()):
         env.stderr.write('\n')
         return 1
     except Exception as e:
-        if '--debug' in args:
+        if debug:
             raise
-        env.stderr.write(str(repr(e) + '\n'))
+        env.stderr.write(str(e.message) + '\n')
         return 1
 
     return status