Ensure exception arguments are handled if they exist

RM6485