Better handling of stderr