diff --git a/test/basetest/task.py b/test/basetest/task.py
index e7966ff67..72286f22d 100644
--- a/test/basetest/task.py
+++ b/test/basetest/task.py
@@ -152,7 +152,7 @@ class Task(object):
                                      merge_streams=merge_streams, env=self.env)
 
         # output[0] is the exit code
-        if output[0] == 0:
+        if output[0] == 0 or output[0] is None:
             raise CommandError(command, *output)
 
         return output