diff --git a/wlauto/utils/ssh.py b/wlauto/utils/ssh.py
index d6d3db7a..44a00aac 100644
--- a/wlauto/utils/ssh.py
+++ b/wlauto/utils/ssh.py
@@ -164,7 +164,7 @@ class SshShell(object):
                         if exit_code:
                             message = 'Got exit code {}\nfrom: {}\nOUTPUT: {}'
                             raise DeviceError(message.format(exit_code, command, output))
-                    except ValueError:
+                    except (ValueError, IndexError):
                         logger.warning('Could not get exit code for "{}",\ngot: "{}"'.format(command, exit_code_text))
                 return output
         except EOF: