Merge "exception handling" into dublin