UUID.fromString throws NumberFormatException

The fromString method throws a NumberFormatException from java.lang.Long. Perhaps it should throw IllegalArgumentException instead even though NFE does extend IAE. The information from Long could be passed along or the NFE could be set as the cause.