Changed exception type to NumberFormatException
Updated exception type
Updated exception type