Replaced ExceptionInvalidParam with IllegalArgumentException