diff --git a/Layout/default/Product/Form.php b/Layout/default/Product/Form.php
index bd7367d8f..4714d2931 100644
--- a/Layout/default/Product/Form.php
+++ b/Layout/default/Product/Form.php
@@ -111,7 +111,7 @@
                   </div>
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="sla_id">SLA *</label>
+                    <label class="col-lg-2 col-form-label" for="sla_id">SLA</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control " name="sla_id" id="sla_id">
                         <option></option>
@@ -128,7 +128,7 @@
                       <select class="select2 form-control select2-multiple" name="networks[]" id="networks" multiple="multiple" data-placeholder="Choose ...">
                         <option></option>
                         <?php foreach($networks as $network): ?>
-                          <option value="<?=$network->id?>" <?=(array_key_exists($network->id, $product->networks)) ? "selected='selected'" : ""?>><?=$network->name?></option>
+                          <option value="<?=$network->id?>" <?=(is_array($product->networks) && array_key_exists($network->id, $product->networks)) ? "selected='selected'" : ""?>><?=$network->name?></option>
                         <?php endforeach; ?>
                       </select>
                     </div>
diff --git a/application/Order/Order.php b/application/Order/Order.php
index 16d4479c2..1acb40ff9 100644
--- a/application/Order/Order.php
+++ b/application/Order/Order.php
@@ -55,6 +55,18 @@ class Order extends mfBaseModel {
     }
   }
   
+  public function deleteFiles() {
+    if(!is_array($this->getProperty("files")) || !count($this->getProperty("files"))) {
+      return true;
+    }
+    //var_dump($this->files);exit;
+    
+    foreach($this->getProperty("files") as $file) {
+      $file->file->delete();
+      $file->delete();
+    }
+  }
+  
   public function getProperty($name) {
     if($this->$name == null) {
       
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index 05309c185..5d464ac96 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -444,8 +444,10 @@ class OrderController extends mfBaseController {
       }
     }
     
+    $order->deleteFiles();
     $order->deletePositions();
     
+    
     // TODO: check if Product is unused
     $order->delete();
     $this->layout()->setFlash("Bestellung gelöscht", "success");
diff --git a/application/Product/ProductController.php b/application/Product/ProductController.php
index 493853cff..e056428c7 100644
--- a/application/Product/ProductController.php
+++ b/application/Product/ProductController.php
@@ -74,7 +74,9 @@ class ProductController extends mfBaseController {
     $data = [];
     $data['name'] = $r->name;
     $data['description'] = $r->description;
-    $data['sla_id'] = $r->sla_id;
+    if($r->sla_id) {
+      $data['sla_id'] = $r->sla_id;
+    }
     $data['external'] = ($r->external == 1) ? "1" : "0";
     $data['price_nne'] = ($r->price_nne) ? Layout::commaToDot($r->price_nne) : 0;
     $data['price_nbe'] = ($r->price_nbe) ? Layout::commaToDot($r->price_nbe) : 0;