Merge "Add generic exception mapper"