#80 Fix NumberFormatExceptions