1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
index 19f24e3..5b645f3 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
@@ -84,6 +84,9 @@ public class CreateOperationController {
                 event -> {
                     if (event.getClickCount() == 2) {
                         boolean remove = false;
+                        if (lvVehicles.getSelectionModel().getSelectedItem() == null) {
+                            return;
+                        }
                         for (Vehicle vehicle : chosenVehicles) {
                             if (lvVehicles.getSelectionModel().getSelectedItem().equals(vehicle)) {
                                 remove = true;