diff --git a/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java b/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
index 6bfce0f35edd54aefd17399072aa49f0bf7ba861..fe5fd7ae02cfc429d7e948be64556317800e814e 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/AddDataController.java
@@ -57,7 +57,6 @@ public class AddDataController {
     public void validate() throws IOException {
         System.out.println("validé");
         ClassificationModel.getClassificationModel().ajouterDonnee(sepalLengthSpinner.getValue(), sepalWidthSpinner.getValue(), petalLengthSpinner.getValue(), petalWidthSpinner.getValue());
-        mainStageView.update(mainStageView.getModel(),new Iris(sepalWidthSpinner.getValue(),sepalLengthSpinner.getValue(),petalWidthSpinner.getValue(),petalLengthSpinner.getValue()));
         stage.close();
     }
 
diff --git a/src/main/java/fr/univlille/sae/classification/controller/AxesSettingsController.java b/src/main/java/fr/univlille/sae/classification/controller/AxesSettingsController.java
index 16cae7a159098b17cb3abc58e7f1c52e33d2dc7d..ed9dce682fca628abf16efc38c63fc0c5c6823e9 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/AxesSettingsController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/AxesSettingsController.java
@@ -1,5 +1,6 @@
 package fr.univlille.sae.classification.controller;
 
+import fr.univlille.sae.classification.model.ClassificationModel;
 import fr.univlille.sae.classification.view.MainStageView;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -41,7 +42,8 @@ public class AxesSettingsController{
     public void validate(){
         mainStageView.setActualX(selectAbs.getValue().toString());
         mainStageView.setActualY(selectOrd.getValue().toString());
-        mainStageView.update(mainStageView.getModel());
+
+        mainStageView.update(ClassificationModel.getClassificationModel());
         stage.close();
     }
 }
diff --git a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
index cf27808e0137d14171c71ffaa2153cc07ff6cd8c..902fb931d0938d3ec76ea2ca6fb11bb5cb92e7fd 100644
--- a/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
+++ b/src/main/java/fr/univlille/sae/classification/controller/LoadDataController.java
@@ -2,6 +2,7 @@ package fr.univlille.sae.classification.controller;
 
 import fr.univlille.sae.classification.model.ClassificationModel;
 import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
@@ -29,10 +30,6 @@ public class LoadDataController {
     File file;
 
 
-    public void loadData() {
-        System.out.println("Loading data");
-        stage.close();
-    }
 
 
     public void openFileChooser() {
@@ -49,7 +46,14 @@ public class LoadDataController {
     public void validate() throws IOException {
 
         if (file == null) {
-            stage.close();
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Erreur de chargement du fichier");
+            alert.setHeaderText(null);
+            alert.initOwner(stage);
+            alert.setContentText("Le chargement du fichier à echoué, veuillez reessayer !");
+            alert.showAndWait();
+            openFileChooser();
+            return;
             //throw exception
         }
         ClassificationModel.getClassificationModel().loadData(file);
diff --git a/src/main/java/fr/univlille/sae/classification/view/AddDataView.java b/src/main/java/fr/univlille/sae/classification/view/AddDataView.java
index 3519b8f09de62b6c2073c9c69f327264d52a9c26..5ab22875f6850e0dcd6366c19483383f86079554 100644
--- a/src/main/java/fr/univlille/sae/classification/view/AddDataView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/AddDataView.java
@@ -4,6 +4,7 @@ import fr.univlille.sae.classification.controller.AddDataController;
 import fr.univlille.sae.classification.controller.AxesSettingsController;
 import fr.univlille.sae.classification.model.ClassificationModel;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Alert;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
@@ -41,6 +42,16 @@ public class AddDataView {
 
         controller.setMainStageView(mainStageView);
 
+        if(model.getDatas().isEmpty()) {
+            Alert alert = new Alert(Alert.AlertType.WARNING);
+            alert.setTitle("Erreur");
+            alert.setHeaderText(null);
+            alert.setContentText("Veuillez d'abord charger les données avant pouvoir ajouter un point");
+            alert.showAndWait();
+            return;
+        }
+
+
         root.setResizable(false);
         root.initOwner(owner);
         root.initModality(Modality.APPLICATION_MODAL);
diff --git a/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java b/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java
index d5cc72fb9ca2601314228f8f4a32f204730fd7a1..48ca4ce0f1b8e3369cc350672cb210b2a0bb39e2 100644
--- a/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/AxesSettingsView.java
@@ -5,6 +5,7 @@ import fr.univlille.sae.classification.controller.MainStageController;
 import fr.univlille.sae.classification.model.ClassificationModel;
 import fr.univlille.sae.classification.model.LoadableData;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Alert;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
@@ -43,9 +44,19 @@ public class AxesSettingsView {
         root.setTitle("Configuration des axes");
         AxesSettingsController controller = loader.getController();
 
+        controller.setMainStageView(mainStageView);
+
+        if(model.getDatas().isEmpty()) {
+            Alert alert = new Alert(Alert.AlertType.WARNING);
+            alert.setTitle("Erreur");
+            alert.setHeaderText(null);
+            alert.setContentText("Veuillez d'abord charger les données avant de modifier les parametres");
+            alert.showAndWait();
+            return;
+        }
+
         LoadableData dataType = model.getDatas().get(0);
 
-        controller.setMainStageView(mainStageView);
 
         controller.setSelectAbs(dataType.getAttributesName());
         controller.setSelectOrd(dataType.getAttributesName());
diff --git a/src/main/java/fr/univlille/sae/classification/view/MainStageView.java b/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
index c6ec0e9111813b611e88b298dad7b803cdc66984..fdf814f70f165f1fd8333b3e3eb61cdeaed9cc2c 100644
--- a/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
+++ b/src/main/java/fr/univlille/sae/classification/view/MainStageView.java
@@ -20,9 +20,7 @@ import javafx.stage.Stage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 public class MainStageView implements Observer {
 
@@ -75,7 +73,9 @@ public class MainStageView implements Observer {
             }
             else{
                 scatterChart.getData().add(series1);
-                for(LoadableData i : model.getDatas()) {
+                List<LoadableData> points = new ArrayList<>(model.getDatas());
+                points.addAll(model.getDataToClass());
+                for(LoadableData i : points) {
                     Iris iris = (Iris)i;
                     XYChart.Data<Double, Double> dataPoint = new XYChart.Data<>(iris.getDataType(actualX),
                             iris.getDataType(actualY));
@@ -128,7 +128,4 @@ public class MainStageView implements Observer {
         return actualY;
     }
 
-    public Observable getModel() {
-        return this.model;
-    }
 }