Adding exceptions and exception mapper