Updated header name for catch, refactored Tuple