Missed some NullPointerException to IllegalArgumentException
conversions.