more robust error handling, esp. in dra local mode; improved output file merging (defaults to master now)