diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
index 36602db..f64bb45 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
@@ -14,48 +14,33 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.layout.GridPane;
 
 import java.sql.SQLException;
 
 public class FallController {
 
+    SimpleObjectProperty<State> state = new SimpleObjectProperty<>(State.VIEW);
+    @FXML
+    Button btnFallSendHl7;
     private MainController mainController;
-
-    public FallController (MainController mainController){
-        this.mainController = mainController;
-    }
-
     @FXML
     private DateTimePicker dtTmAufnahme, dtTmEntlassung;
-
     @FXML
     private Label fallPatID;
-
     @FXML
     private ComboBox<FallArt> fallFallart;
-
     @FXML
     private ComboBox<Kasse> fallKasse;
-
     @FXML
     private TextField fallVersichertennummer;
-
     @FXML
     private TextField fallEinweisenderArzt;
     @FXML
     private CheckBox fallSelbsteinweisung;
-
-
     @FXML
     private ComboBox<Diagnose> fallHauptdiagnose;
-
-
     @FXML
     private Label fallCreator;
     @FXML
@@ -66,34 +51,30 @@ public class FallController {
     private Label fallEditTime;
     @FXML
     private Button btnFallSave;
-
     @FXML
     private Button btnFallAbort;
     @FXML
     private Button btnFallCancel;
     @FXML
     private Button btnFallEnableEdit;
-
     @FXML
     private GridPane fallFields;
-
-
     private SimpleObjectProperty<Fall> fallProperty = new SimpleObjectProperty<>();
 
-    public Fall getFall() {
-        return fallProperty.get();
+    public FallController(MainController mainController) {
+        this.mainController = mainController;
     }
 
-    public SimpleObjectProperty<Fall> fallPropertyProperty() {
-        return fallProperty;
+    public Fall getFall() {
+        return fallProperty.get();
     }
 
     public void setFall(Fall fall) {
         this.fallProperty.set(fall);
     }
 
-    public enum State {
-        CREATE, EDIT, VIEW
+    public SimpleObjectProperty<Fall> fallPropertyProperty() {
+        return fallProperty;
     }
 
     public State getState() {
@@ -104,27 +85,18 @@ public class FallController {
         return state;
     }
 
-
-
-    SimpleObjectProperty<State> state = new SimpleObjectProperty<>(State.VIEW);
-
-
-
     public ObjectProperty<ObservableList<Diagnose>> diagnosenProperty(){
        return  fallHauptdiagnose.itemsProperty();
     }
 
-    public void setDiagnosen(ObservableList<Diagnose> list){
-        fallHauptdiagnose.setItems(list);
+    public ObservableList<Diagnose> getDiagnosen() {
+        return fallHauptdiagnose.getItems();
     }
 
-    public ObservableList<Diagnose> getDiagnosen(){
-        return  fallHauptdiagnose.getItems();
+    public void setDiagnosen(ObservableList<Diagnose> list){
+        fallHauptdiagnose.setItems(list);
     }
 
-
-
-
     @FXML
     public void initialize(){
         fallEinweisenderArzt.disableProperty().bind(fallSelbsteinweisung.selectedProperty());
@@ -183,9 +155,6 @@ public class FallController {
     }
 
     @FXML
-    Button btnFallSendHl7;
-
-    @FXML
     private void clickedSendHl7(){
         /* Natascha */
         //TODO send funny message
@@ -197,7 +166,6 @@ public class FallController {
         this.state.set(State.EDIT);
     }
 
-
     @FXML
     void clickedFallEnableEdit(ActionEvent event) {
         editFall();
@@ -205,11 +173,11 @@ public class FallController {
 
     @FXML
     void clickedFallCancel(ActionEvent event) {
-        if(fallProperty.get()!=null){
+        if (fallProperty.get() != null) {
             fallProperty.get().setStorniert(true);
             try {
                 DBHandler.setFall(fallProperty.get(), mainController.getCurrentMitarbeiter().getMitarbID(), true);
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
             }
             mainController.refreshCasesFromDb(mainController.getPatientTablesController().getSelectedPatient());
@@ -262,9 +230,6 @@ public class FallController {
         fallVersichertennummer.setText(patient.getVersichertennummer());
     }
 
-
-
-
     private void clearFields(){
         if(state.get() == State.CREATE) {
             dtTmAufnahme.setToCurrentDateTime();
@@ -293,7 +258,6 @@ public class FallController {
         fallFallart.setValue(null);
     }
 
-
     private void copyFieldDataIntoFall(Fall fall){
         fall.setPatient(mainController.getPatientTablesController().getSelectedPatient());
         fall.setAufnahmeDatum(dtTmAufnahme.getDateTime());
@@ -309,14 +273,15 @@ public class FallController {
         fall.setKasse(fallKasse.getValue());
         fall.setFallArt(fallFallart.getValue());
 
-        fall.setHauptdiagnoseId(fallHauptdiagnose.getSelectionModel().getSelectedItem().getDiagID());
+        if (fallHauptdiagnose.getSelectionModel().getSelectedItem() != null) {
+            fall.setHauptdiagnoseId(fallHauptdiagnose.getSelectionModel().getSelectedItem().getDiagID());
+        }
 
 
 
         //fall.setVorstellDatum(); //TODO
     }
 
-
     private void copyFallDataIntoField(Fall fall){
         if(fall==null){
             System.out.println("copyFallDataIntoFiled - Fall ist null");
@@ -353,4 +318,9 @@ public class FallController {
 
         fallFallart.setValue(fall.getFallArt());
     }
+
+
+    public enum State {
+        CREATE, EDIT, VIEW
+    }
 }
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
index abf6b4f..f4ce6a1 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
@@ -486,13 +486,13 @@ public class DBHandler {
         }
         statement.setBoolean(6, fall.getSelbsteinweisung());                            // Selbsteinweisung
         if (fall.getHauptdiagnoseId() != 0) {
-            statement.setInt(7, fall.getHauptdiagnoseId());                   // Hauptdiagnose
+            statement.setInt(7, fall.getHauptdiagnoseId());                             // Hauptdiagnose
         } else {
             statement.setTimestamp(7, null);
         }
-        statement.setString(8, fall.getVersichertenNummer());                          // Versichertennummer
+        statement.setString(8, fall.getVersichertenNummer());                           // Versichertennummer
         if (fall.getKasse() != null) {
-            statement.setInt(9, fall.getKasse().getKassenID());                        // KassenID
+            statement.setInt(9, fall.getKasse().getKassenID());                         // KassenID
         } else {
             statement.setTimestamp(9, null);
         }