exception_formatter returns only status, not the entire results tuple

3 files changed, 3 insertions, 4 deletions

diff --git a/pgcli/main.py b/pgcli/main.py
index 173d3eb7..673a42c8 100755
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -619,8 +619,7 @@ def quit_command(sql):
 
 
 def exception_formatter(e):
-    msg = click.style(utf8tounicode(str(e)), fg='red')
-    return None, None, None, msg
+    return click.style(utf8tounicode(str(e)), fg='red')
 
 
 if __name__ == "__main__":
diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
index 77160f00..326fb123 100644
--- a/pgcli/pgexecute.py
+++ b/pgcli/pgexecute.py
@@ -272,7 +272,7 @@ class PGExecute(object):
                     # specification
                     raise
 
-                yield exception_formatter(e)
+                yield None, None, None, exception_formatter(e)
 
                 if not on_error_resume:
                     break
diff --git a/tests/conftest.py b/tests/conftest.py
index 86dc421f..06b61462 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -28,6 +28,6 @@ def executor(connection):
 
 @pytest.fixture
 def exception_formatter():
-    return lambda e: (None, None, None, str(e))
+    return lambda e: str(e)