Add catch-stderr option