Add catch-stderr option

On our case, just writing "Failed" gives us no information about the failure. So, I modified this to include a catch-stderr option.