diff --git a/wlauto/utils/misc.py b/wlauto/utils/misc.py
index 4747c4ba..51829ebe 100644
--- a/wlauto/utils/misc.py
+++ b/wlauto/utils/misc.py
@@ -85,6 +85,7 @@ class TimeoutError(Exception):
 class CalledProcessErrorWithStderr(CalledProcessError):
 
     def __init__(self, *args, **kwargs):
+        self.output = kwargs.pop("output")
         self.error = kwargs.pop("error")
         super(CalledProcessErrorWithStderr, self).__init__(*args, **kwargs)
 
diff --git a/wlauto/utils/ssh.py b/wlauto/utils/ssh.py
index c5bd1777..e62203df 100644
--- a/wlauto/utils/ssh.py
+++ b/wlauto/utils/ssh.py
@@ -245,7 +245,8 @@ class SshShell(object):
         except subprocess.CalledProcessError as e:
             raise CalledProcessErrorWithStderr(e.returncode,
                                                e.cmd.replace(pass_string, ''),
-                                               e.output, getattr(e, 'error', ''))
+                                               output=e.output,
+                                               error=getattr(e, 'error', ''))
         except TimeoutError as e:
             raise TimeoutError(e.command.replace(pass_string, ''), e.output)