Change exception type to IllegalArgumentException