diff --git a/autoload/.DS_Store b/autoload/.DS_Store
deleted file mode 100644
index 3239922..0000000
Binary files a/autoload/.DS_Store and /dev/null differ
diff --git a/autoload/admin/controls/class.ShopOrder.php b/autoload/admin/controls/class.ShopOrder.php
index 22b7545..bff2dbd 100644
--- a/autoload/admin/controls/class.ShopOrder.php
+++ b/autoload/admin/controls/class.ShopOrder.php
@@ -52,7 +52,7 @@ class ShopOrder
   public static function order_details()
   {
     $order = new \shop\Order( (int)\S::get( 'order_id' ) );
-    $coupon = new \shop\Coupon( $order -> coupon_id );
+    $coupon = $order -> coupon_id ? new \shop\Coupon( $order -> coupon_id ) : null;
 
     return \Tpl::view( 'shop-order/order-details', [
       'order' => $order,
diff --git a/autoload/front/.DS_Store b/autoload/front/.DS_Store
deleted file mode 100644
index 7285fd1..0000000
Binary files a/autoload/front/.DS_Store and /dev/null differ
diff --git a/autoload/front/controls/class.ShopOrder.php b/autoload/front/controls/class.ShopOrder.php
index ac40287..2c18a2e 100644
--- a/autoload/front/controls/class.ShopOrder.php
+++ b/autoload/front/controls/class.ShopOrder.php
@@ -145,7 +145,7 @@ class ShopOrder
     $order = \front\factory\ShopOrder::order_details(
       \front\factory\ShopOrder::order_id( \S::get( 'order_hash' ) )
     );
-    $coupon = new \shop\Coupon( $order['coupon_id'] );
+    $coupon = (int)$order['coupon_id'] ? new \shop\Coupon( (int)$order['coupon_id'] ) : null;
 
     return \Tpl::view( 'shop-order/order-details', [
       'order' => $order,
diff --git a/autoload/shop/class.Coupon.php b/autoload/shop/class.Coupon.php
index 6453bd7..93d7872 100644
--- a/autoload/shop/class.Coupon.php
+++ b/autoload/shop/class.Coupon.php
@@ -5,6 +5,7 @@ class Coupon implements \ArrayAccess
   public function __construct( int $element_id )
   {
     global $mdb;
+
     if ( $element_id )
     {
       $result = $mdb -> get( 'pp_shop_coupon', '*', [ 'id' => $element_id ] );
@@ -46,7 +47,7 @@ class Coupon implements \ArrayAccess
 
   public function __get( $variable )
   {
-    if ( array_key_exists( $variable, $this -> data ) )
+    if ( is_array( $this -> data ) and array_key_exists( $variable, $this -> data ) )
       return $this -> $variable;
   }
 
diff --git a/autoload/shop/class.Order.php b/autoload/shop/class.Order.php
index c74b545..d7179b2 100644
--- a/autoload/shop/class.Order.php
+++ b/autoload/shop/class.Order.php
@@ -328,7 +328,7 @@ class Order implements \ArrayAccess
     global $settings;
 
     $order = \front\factory\ShopOrder::order_details( $this -> id );
-    $coupon = new \shop\Coupon( $order['coupon_id'] );
+    $coupon = (int)$order['coupon_id'] ? new \shop\Coupon( (int)$order['coupon_id'] ) : null;
 
     $mail_order = \Tpl::view( 'shop-order/mail-summary', [
       'settings' => $settings,
diff --git a/templates/.DS_Store b/templates/.DS_Store
deleted file mode 100644
index 35bede8..0000000
Binary files a/templates/.DS_Store and /dev/null differ