diff --git a/application/Order/Order.php b/application/Order/Order.php
index 9c1f92b37..e4b1c1385 100644
--- a/application/Order/Order.php
+++ b/application/Order/Order.php
@@ -14,7 +14,12 @@ class Order extends mfBaseModel {
       return 0;
     }
     
-    $p = end($this->getProperty("products"));
+    $products = $this->getProperty("products");
+    if(!is_array($products) || !count($products)) {
+      return 1;
+    }
+    
+    $p = end($products);
     return ++$p->pos;
   }
   
diff --git a/application/Order/OrderModel.php b/application/Order/OrderModel.php
index 639211729..c5708828a 100644
--- a/application/Order/OrderModel.php
+++ b/application/Order/OrderModel.php
@@ -5,6 +5,8 @@ class OrderModel {
   public $billingaddress_id;
   public $order_date;
   public $finish_date;
+  public $finish_after;
+  public $finish_after_comment;
   public $billing_text;
   public $bank_account_bank;
   public $bank_account_owner;
diff --git a/application/OrderProduct/OrderProductModel.php b/application/OrderProduct/OrderProductModel.php
index 18f813ba3..b77ba55f6 100644
--- a/application/OrderProduct/OrderProductModel.php
+++ b/application/OrderProduct/OrderProductModel.php
@@ -3,6 +3,7 @@
 class OrderProductModel {
   public $order_id;
   public $product_id;
+  public $termination_id;
   public $amount;
   public $pos;
   public $description;