swap var names
Ensure we return correct type from executeBuild on all failures