diff --git a/CHANGELOG.md b/CHANGELOG.md
index f344f18..7fc1cf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@ Types of changes
 - `Fixed` for any bug fixes.
 - `Security` in case of vulnerabilities.
 
+## [0.3.1]
+
+- `Fixed` panic when a null value in dataset (#22)
+
 ## [0.3.0]
 
 - `Added`export configuration in yaml file (#32)
diff --git a/cmd/sigo/main.go b/cmd/sigo/main.go
index 5a6fb7f..82a3fa0 100644
--- a/cmd/sigo/main.go
+++ b/cmd/sigo/main.go
@@ -33,7 +33,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// nolint: gochecknoglobals
+//nolint: gochecknoglobals
 var (
 	name      string
 	version   string
@@ -77,7 +77,7 @@ Copyright (C) 2022 CGI France \n License GPLv3: GNU GPL version 3 <https://gnu.o
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.`, version, commit, buildDate, builtBy),
 		Run: func(cmd *cobra.Command, args []string) {
-			// nolint: exhaustivestruct
+			//nolint: exhaustivestruct
 			log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 
 			definition.flagIsSet(*cmd)
@@ -94,7 +94,7 @@ There is NO WARRANTY, to the extent permitted by law.`, version, commit, buildDa
 	rootCmd.PersistentFlags().
 		BoolVar(&logs.jsonlog, "log-json", false, "output logs in JSON format")
 	rootCmd.PersistentFlags().StringVar(&logs.colormode, "color", "auto", "use colors in log outputs : yes, no or auto")
-	// nolint: gomnd
+	//nolint: gomnd
 	rootCmd.PersistentFlags().IntVarP(&definition.k, "k-value", "k", 3, "k-value for k-anonymization")
 	rootCmd.PersistentFlags().IntVarP(&definition.l, "l-value", "l", 1, "l-value for l-diversity")
 	rootCmd.PersistentFlags().
@@ -121,6 +121,7 @@ There is NO WARRANTY, to the extent permitted by law.`, version, commit, buildDa
 	}
 }
 
+//nolint: funlen
 func run(definition pdef, logs logs) {
 	initLog(logs, definition.entropy)
 
@@ -175,7 +176,9 @@ func run(definition pdef, logs logs) {
 	err = sigo.Anonymize(source, sigo.NewKDTreeFactory(), definition.k, definition.l,
 		len(definition.qi), newAnonymizer(definition.method, definition.args), sink, debugger)
 	if err != nil {
-		panic(err)
+		log.Err(err).Msg("Unsupported input data.")
+		log.Warn().Int("return", 1).Msg("End SIGO")
+		os.Exit(1)
 	}
 
 	if logs.profiling {
@@ -183,7 +186,7 @@ func run(definition pdef, logs logs) {
 	}
 }
 
-// nolint: cyclop
+//nolint: cyclop
 func initLog(logs logs, entropy bool) {
 	color := false
 
@@ -200,7 +203,7 @@ func initLog(logs logs, entropy bool) {
 	if logs.jsonlog {
 		logger = zerolog.New(os.Stderr)
 	} else {
-		// nolint: exhaustivestruct
+		//nolint: exhaustivestruct
 		logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr, NoColor: !color})
 	}
 
diff --git a/internal/infra/source.go b/internal/infra/source.go
index 8b016ee..ad98c0b 100644
--- a/internal/infra/source.go
+++ b/internal/infra/source.go
@@ -18,21 +18,29 @@
 package infra
 
 import (
+	"encoding/json"
 	"errors"
+	"fmt"
 	"io"
+	"strconv"
 
 	"github.com/cgi-fr/jsonline/pkg/jsonline"
 	"github.com/cgi-fr/sigo/pkg/sigo"
 )
 
-func NewJSONLineRecord(row *jsonline.Row, quasiIdentifers *[]string, sensitives *[]string) JSONLineRecord {
-	return JSONLineRecord{row, quasiIdentifers, sensitives}
+func NewJSONLineRecord(row *jsonline.Row, quasiIdentifers *[]string, sensitives *[]string, options ...*map[string]float64) JSONLineRecord {
+	if len(options) != 0 {
+		return JSONLineRecord{row, quasiIdentifers, sensitives, options[0]}
+	} else {
+		return JSONLineRecord{row, quasiIdentifers, sensitives, &map[string]float64{}}
+	}
 }
 
 type JSONLineRecord struct {
 	row             *jsonline.Row
 	quasiIdentifers *[]string
 	sensitives      *[]string
+	float64QI       *map[string]float64
 }
 
 func (jlr JSONLineRecord) QuasiIdentifer() []float64 {
@@ -65,9 +73,18 @@ func (jlr JSONLineRecord) Row() map[string]interface{} {
 	return result.(map[string]interface{})
 }
 
+func (jlr JSONLineRecord) GetQI() map[string]float64 {
+	return *jlr.float64QI
+}
+
 func NewJSONLineSource(r io.Reader, quasiIdentifers []string, sensitives []string) (sigo.RecordSource, error) {
 	// nolint: exhaustivestruct
-	source := &JSONLineSource{importer: jsonline.NewImporter(r), quasiIdentifers: quasiIdentifers, sensitives: sensitives}
+	source := &JSONLineSource{
+		importer:        jsonline.NewImporter(r),
+		quasiIdentifers: quasiIdentifers,
+		sensitives:      sensitives,
+		DataValidator:   NewFloat64DataValidator(),
+	}
 
 	//nolint: goerr113
 	err := errors.New("indicate the list of quasi-identifiers")
@@ -79,6 +96,7 @@ func NewJSONLineSource(r io.Reader, quasiIdentifers []string, sensitives []strin
 }
 
 type JSONLineSource struct {
+	sigo.DataValidator
 	importer        jsonline.Importer
 	err             error
 	record          sigo.Record
@@ -101,11 +119,22 @@ func (s *JSONLineSource) Next() bool {
 	s.err = err
 
 	if s.err != nil {
-		return false
+		return true
+	}
+	rowInterface, err2 := row.Export()
+	s.err = err2
+	if err2 != nil {
+		return true
 	}
 
-	s.record = NewJSONLineRecord(&row, &s.quasiIdentifers, &s.sensitives)
+	float64Map, err3 := s.DataValidator.Validation(rowInterface.(map[string]interface{}), s.quasiIdentifers)
+	s.err = err3
 
+	if s.err != nil {
+		return true
+	}
+
+	s.record = NewJSONLineRecord(&row, &s.quasiIdentifers, &s.sensitives, &float64Map)
 	return true
 }
 
@@ -120,3 +149,75 @@ func (s *JSONLineSource) QuasiIdentifer() []string {
 func (s *JSONLineSource) Sensitive() []string {
 	return s.sensitives
 }
+
+type Float64DataValidator struct{}
+
+func NewFloat64DataValidator() Float64DataValidator {
+	return Float64DataValidator{}
+}
+
+func (v Float64DataValidator) Validation(row map[string]interface{}, quasiIdentifers []string) (map[string]float64, error) {
+	result := make(map[string]float64)
+
+	for _, key := range quasiIdentifers {
+		// Null value check
+		if row[key] == nil {
+			//nolint: goerr113
+			err := errors.New("null value in dataset")
+
+			return nil, err
+		}
+
+		// Type check
+		valFloat64, typeErr := transformType(row, key)
+		if typeErr != nil {
+			return nil, typeErr
+		}
+
+		result[key] = valFloat64
+	}
+
+	return result, nil
+}
+
+func transformType(row map[string]interface{}, key string) (float64, error) {
+	var result float64
+
+	//nolint: varnamelen
+	switch t := row[key].(type) {
+	case int:
+		result = float64(t)
+	case string:
+		//nolint: gomnd
+		val, err := strconv.ParseFloat(t, 64)
+		if err != nil {
+			//nolint: goerr113
+			err = fmt.Errorf("unsupported type: %T", t)
+
+			return result, err
+		}
+
+		result = val
+	case float32:
+		result = float64(t)
+	case json.Number:
+		val, err := t.Float64()
+		if err != nil {
+			//nolint: goerr113
+			err = fmt.Errorf("unsupported type: %T", t)
+
+			return result, err
+		}
+
+		result = val
+	case float64:
+		result = t
+	default:
+		//nolint: goerr113
+		err := fmt.Errorf("unsupported type: %T", t)
+
+		return result, err
+	}
+
+	return result, nil
+}
diff --git a/pkg/sigo/anonymizer.go b/pkg/sigo/anonymizer.go
index 40ea218..0ea87b3 100644
--- a/pkg/sigo/anonymizer.go
+++ b/pkg/sigo/anonymizer.go
@@ -105,6 +105,10 @@ func (ar AnonymizedRecord) Sensitives() []interface{} {
 	return ar.original.Sensitives()
 }
 
+func (ar AnonymizedRecord) GetQI() map[string]float64 {
+	return ar.original.GetQI()
+}
+
 func (ar AnonymizedRecord) Row() map[string]interface{} {
 	original := ar.original.Row()
 	for k, v := range ar.mask {
@@ -416,9 +420,9 @@ func (r Reidentification) Statistics(idCluster string, q string) (mean float64,
 
 // ComputeSimilarity computes the similarity score between the record rec and the anonymized cluster data.
 func (r Reidentification) ComputeSimilarity(rec Record, clus Cluster,
-	qi []string, s []string) map[float64]interface{} {
+	qi []string, s []string,
+) map[float64]interface{} {
 	scores := make(map[float64]interface{})
-
 	x := make(map[string]interface{})
 
 	for _, q := range qi {
@@ -437,7 +441,6 @@ func (r Reidentification) ComputeSimilarity(rec Record, clus Cluster,
 		}
 
 		Y := MapItoMapF(y)
-
 		// Compute similarity
 		score := Similarity(ComputeDistance("", X, Y))
 
diff --git a/pkg/sigo/anonymizer_test.go b/pkg/sigo/anonymizer_test.go
index e30bdcb..ca6d095 100644
--- a/pkg/sigo/anonymizer_test.go
+++ b/pkg/sigo/anonymizer_test.go
@@ -321,3 +321,28 @@ func createRowReidentification(x, y float64, qi []string, o json.Number, s []str
 
 	return infra.NewJSONLineRecord(&row, &qi, &s)
 }
+
+func TestGetAndSetQI(t *testing.T) {
+	t.Parallel()
+
+	qi := []string{"x", "y"}
+	float64QI := make(map[string]float64)
+	float64QI["x"] = float64(1)
+	float64QI["y"] = float64(4)
+
+	record := createRowWithFloatQI(1, 4, qi, "", []string{}, make(map[string]float64))
+	assert.Equal(t, 0, len(record.GetQI()))
+
+	assert.Equal(t, 2, len(float64QI))
+	recordWithFloat64QI := createRowWithFloatQI(1, 4, qi, "", []string{}, float64QI)
+	assert.Equal(t, 2, len(recordWithFloat64QI.GetQI()))
+}
+
+func createRowWithFloatQI(x, y float64, qi []string, z string, s []string, float64QI map[string]float64) infra.JSONLineRecord {
+	row := jsonline.NewRow()
+	row.Set("x", x)
+	row.Set("y", y)
+	row.Set("z", z)
+
+	return infra.NewJSONLineRecord(&row, &qi, &s, &float64QI)
+}
diff --git a/pkg/sigo/driver.go b/pkg/sigo/driver.go
index 214e9ba..51bea66 100644
--- a/pkg/sigo/driver.go
+++ b/pkg/sigo/driver.go
@@ -24,7 +24,8 @@ import (
 )
 
 func Anonymize(source RecordSource, factory GeneralizerFactory,
-	k int, l int, dim int, anonymyzer Anonymizer, sink RecordSink, debugger Debugger) error {
+	k int, l int, dim int, anonymyzer Anonymizer, sink RecordSink, debugger Debugger,
+) error {
 	generalizer := factory.New(k, l, dim, source.QuasiIdentifer())
 	count := 0
 
diff --git a/pkg/sigo/driver_test.go b/pkg/sigo/driver_test.go
index 0be482a..dd0624d 100644
--- a/pkg/sigo/driver_test.go
+++ b/pkg/sigo/driver_test.go
@@ -144,3 +144,43 @@ func BenchmarkLongClustering(b *testing.B) {
 		jsonBytes.Close()
 	}
 }
+
+func TestDataValidatorShouldReturnErrorWithNullValue(t *testing.T) {
+	t.Parallel()
+
+	sourceText := `{"x":0, "y":2, "foo":"bar"}
+				   {"x":1, "y":1, "foo":"bar"}
+				   {"x":0, "y":null, "foo":"bar"}
+				   {"x":2, "y":1, "foo":"baz"}
+				   {"x":3, "y":2, "foo":"baz"}`
+
+	source, err := infra.NewJSONLineSource(strings.NewReader(sourceText), []string{"x", "y"}, []string{"foo"})
+	assert.Nil(t, err)
+
+	expectedMessage := "null value in dataset"
+	result := []map[string]interface{}{}
+	sink := infra.NewSliceDictionariesSink(&result)
+	err = sigo.Anonymize(source, sigo.NewKDTreeFactory(), 2, 1, 2, sigo.NewNoAnonymizer(), sink,
+		sigo.NewSequenceDebugger("clusterID"))
+	assert.Equal(t, expectedMessage, err.Error())
+}
+
+func TestDataValidatorShouldReturnErrorWithStringValue(t *testing.T) {
+	t.Parallel()
+
+	sourceText := `{"x":0, "y":2, "foo":"bar"}
+				   {"x":1, "y":1, "foo":"bar"}
+				   {"x":0, "y":"hello", "foo":"bar"}
+				   {"x":2, "y":1, "foo":"baz"}
+				   {"x":3, "y":2, "foo":"baz"}`
+
+	source, err := infra.NewJSONLineSource(strings.NewReader(sourceText), []string{"x", "y"}, []string{"foo"})
+	assert.Nil(t, err)
+
+	expectedMessage := "unsupported type: string"
+	result := []map[string]interface{}{}
+	sink := infra.NewSliceDictionariesSink(&result)
+	err = sigo.Anonymize(source, sigo.NewKDTreeFactory(), 2, 1, 2, sigo.NewNoAnonymizer(), sink,
+		sigo.NewSequenceDebugger("clusterID"))
+	assert.Equal(t, expectedMessage, err.Error())
+}
diff --git a/pkg/sigo/info.go b/pkg/sigo/info.go
index b3b9735..4c049f2 100644
--- a/pkg/sigo/info.go
+++ b/pkg/sigo/info.go
@@ -46,6 +46,11 @@ func (ir InfosRecord) Row() map[string]interface{} {
 	return original
 }
 
+func (ir InfosRecord) GetQI() map[string]float64 {
+	return ir.original.GetQI()
+}
+
+
 // id returns the path of cluster c coverts to integer.
 func (d SequenceDebugger) id(c Cluster) int {
 	count := len(d.cache)
diff --git a/pkg/sigo/model.go b/pkg/sigo/model.go
index b0cc461..876112c 100644
--- a/pkg/sigo/model.go
+++ b/pkg/sigo/model.go
@@ -18,6 +18,7 @@
 package sigo
 
 type RecordSource interface {
+	DataValidator
 	Next() bool
 	Err() error
 	Value() Record
@@ -33,6 +34,7 @@ type Record interface {
 	QuasiIdentifer() []float64
 	Sensitives() []interface{}
 	Row() map[string]interface{}
+	GetQI() map[string]float64
 }
 
 type Cluster interface {
@@ -58,3 +60,7 @@ type Anonymizer interface {
 type Debugger interface {
 	Information(Record, Cluster) Record
 }
+
+type DataValidator interface {
+	Validation(row map[string]interface{}, quasiIdentifers []string) (map[string]float64, error)
+}
diff --git a/test/suites/04-run-anonymizer.yml b/test/suites/04-run-anonymizer.yml
index 7d9203a..9f554c1 100644
--- a/test/suites/04-run-anonymizer.yml
+++ b/test/suites/04-run-anonymizer.yml
@@ -52,3 +52,40 @@ testcases:
           - result.code ShouldEqual 0
           - result.systemout ShouldBeEmpty
 
+  - name: null value in dataset should return error
+    steps:
+      - script: rm -f output_sigo.json
+      - script: rm -f output_jq.json
+      - script: |-
+          sigo -q taille,poids,fruit,natation,course,voltige -s meurtre -k 2 -l 2 -a general -v 5 > output_sigo.json <<EOF
+          {"fruit":1, "taille": 2, "poids": 2 , "meurtre": 0, "natation":1, "course":1, "voltige":1 , "animal": "canard"}
+          {"fruit":1, "taille": 5, "poids": 5 , "meurtre": 0, "natation":1, "course":1, "voltige":0 , "animal": "elephant"}
+          {"fruit":1, "taille": 4, "poids": 4 , "meurtre": 1, "natation":1, "course":1, "voltige":0 , "animal": "ours"}
+          {"fruit":1, "taille": 1, "poids": null , "meurtre": 0, "natation":0, "course":1, "voltige":0, "animal":"souris" }
+          {"fruit":0, "taille": 2, "poids": 2 , "meurtre": 0, "natation":1, "course":0, "voltige":0 , "animal": "saumon"}
+          {"fruit":0, "taille": 2, "poids": 1 , "meurtre": 1, "natation":0, "course":0, "voltige":1, "animal" : "chouette" }
+          {"fruit":1, "taille": 3, "poids": 3 , "meurtre": 0, "natation":1, "course":0, "voltige":1 , "animal": "singe"}
+          {"fruit":0, "taille": 3, "poids": 2 , "meurtre": 1, "natation":0, "course":1, "voltige":0 , "animal" : "loup"}
+          EOF
+        assertions:
+          - result.code ShouldEqual 1
+          - result.systemerr ShouldContainSubstring null value
+
+  - name: wrong type in dataset should return error
+    steps:
+      - script: rm -f output_sigo.json
+      - script: rm -f output_jq.json
+      - script: |-
+          sigo -q taille,poids,fruit,natation,course,voltige -s meurtre -k 2 -l 2 -a general -v 5 > output_sigo.json <<EOF
+          {"fruit":1, "taille": 2, "poids": 2 , "meurtre": 0, "natation":1, "course":1, "voltige":1 , "animal": "canard"}
+          {"fruit":1, "taille": 5, "poids": 5 , "meurtre": 0, "natation":1, "course":1, "voltige":0 , "animal": "elephant"}
+          {"fruit":1, "taille": false, "poids": 4 , "meurtre": 1, "natation":1, "course":1, "voltige":0 , "animal": "ours"}
+          {"fruit":1, "taille": 1, "poids": 1 , "meurtre": 0, "natation":0, "course":1, "voltige":0, "animal":"souris" }
+          {"fruit":0, "taille": 2, "poids": 2 , "meurtre": 0, "natation":1, "course":0, "voltige":0 , "animal": "saumon"}
+          {"fruit":0, "taille": 2, "poids": 1 , "meurtre": 1, "natation":0, "course":0, "voltige":1, "animal" : "chouette" }
+          {"fruit":1, "taille": 3, "poids": 3 , "meurtre": 0, "natation":1, "course":0, "voltige":1 , "animal": "singe"}
+          {"fruit":0, "taille": 3, "poids": false , "meurtre": 1, "natation":0, "course":1, "voltige":0 , "animal" : "loup"}
+          EOF
+        assertions:
+          - result.code ShouldEqual 1
+          - result.systemerr ShouldContainSubstring unsupported type