Ported 'AddCatchTypeAction'.

Currently failing due to formatting update.