Modify catching Exception type to IllegalArgumentException