Make exception matcher match both type and msg

I need to rework the matchers (no need to have 2 differents matchers). 

I'll try to do it during the week-end.