Reverted ExceptionMapper Map method back into two methods and made sure to call one or the other method in the same way we did in 1.x in order to get the same exceptions thrown in 2.x.