refactor-864370: Propagate error status to outside correctly

Signed-off-by: Joe Walker <jwalker@mozilla.com>