Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 7306)
+++ /controller/wpsg_BasketController.class.php	(revision 7307)
@@ -476,4 +476,5 @@
 					 
 					$this->shop->view['product_data'] = $this->shop->loadProduktArray($this->shop->getProduktId($product_key));
+					$this->shop->view['oProduct'] = wpsg_product::getInstance($this->shop->getProduktID($product_key));
 					$this->shop->view['product_key'] = $_REQUEST['wpsg']['produkt_id'];
 					$this->shop->view['amount_add'] = $_REQUEST['wpsg']['menge'];
@@ -518,7 +519,8 @@
 					if ($this->shop->get_option('wpsg_afterinsert') == '3')
 					{
-				 
+						
+						$this->shop->view['product_data']['preis'] = $this->shop->view['oProduct']->getPrice($product_key, $this->shop->getFrontendTaxview());
 						$this->shop->view['content'] = $this->shop->render(WPSG_PATH_VIEW.'warenkorb/ajaxDialog.phtml', false);
-						
+												
 						die($this->shop->render(WPSG_PATH_VIEW.'warenkorb/messageDialog.phtml'));
 						
Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7306)
+++ /controller/wpsg_ShopController.class.php	(revision 7307)
@@ -1560,5 +1560,5 @@
 		public function renderProdukt($produkt_id, $force_template = false, $force_locale = false)
 		{
-
+			
 			global $locale, $l10n;
 
@@ -1592,5 +1592,6 @@
 
 				$this->view['data'] = $this->loadProduktArray($produkt_id);
-
+				if (!wpsg_isSizedArray($this->view['data'])) return '';
+				
 			}
 
@@ -2013,5 +2014,5 @@
 		    
 			$produkt = $this->cache->loadProduct($produkt_id);
-
+			
 			if ($loadDisabled === false && wpsg_isSizedInt($produkt['disabled'])) return array();
 			
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7306)
+++ /lib/wpsg_basket.class.php	(revision 7307)
@@ -1975,8 +1975,6 @@
 			$arReturn['shipping']['preis_shipping_brutto'] = wpsg_getStr($arCalculation['shipping'][0]['brutto']);
 			
-			if (isset($arCalculation['shipping']))
-				$arReturn['shipping']['tax_value'] = $arCalculation['tax'][$arCalculation['shipping'][0]['tax_key']]['tax_value'];
-			else
-				$arReturn['shipping']['tax_value'] = 0;
+			if (@isset($arCalculation['tax'][$arCalculation['shipping'][0]['tax_key']]['tax_value'])) $arReturn['shipping']['tax_value'] = $arCalculation['tax'][$arCalculation['shipping'][0]['tax_key']]['tax_value'];
+			else $arReturn['shipping']['tax_value'] = 0;
 			 
 			$arReturn['mwst'] = [];
Index: /mods/wpsg_mod_coverletter.class.php
===================================================================
--- /mods/wpsg_mod_coverletter.class.php	(revision 7306)
+++ /mods/wpsg_mod_coverletter.class.php	(revision 7307)
@@ -203,5 +203,5 @@
 				$arCustomReplace = [];
 				
-				if (wpsg_getStr($_REQUEST['target']) === '2') {
+				if (wpsg_getStr($_REQUEST['target'])	 === '2') {
 					 
 					$arCustomReplace = [
Index: /mods/wpsg_mod_scaleprice.class.php
===================================================================
--- /mods/wpsg_mod_scaleprice.class.php	(revision 7306)
+++ /mods/wpsg_mod_scaleprice.class.php	(revision 7307)
@@ -245,6 +245,6 @@
 			foreach ($arScale as $k => $v) {
 				
-				if ($oProduct->wpsg_mod_scaleprice_typ === self::TYP_QUANTITY) {
-				
+				if ($oProduct->wpsg_mod_scaleprice_typ == self::TYP_QUANTITY) {
+			 
 					$arScale[$k]['value'] = $oProduct->getPrice($produkt_key, $this->shop->getFrontendTaxview(), $v['scale'], false);
 					
@@ -284,5 +284,13 @@
 					
 						// Menge im Warenkorb bestimmen
-						foreach ($_SESSION['wpsg']['basket'] as $product_index => $basket_data) if ($this->shop->getProduktID($basket_data['id']) == $oProduct->id) $amount_basket += $basket_data['menge'];
+						if (wpsg_isSizedArray($_SESSION['wpsg']['basket'])) {
+						
+							foreach ($_SESSION['wpsg']['basket'] as $product_index => $basket_data) {
+								
+								if ($product_key === $basket_data['id']) $amount_basket += $basket_data['menge'];
+								
+							}
+						
+						}
 					
 					} else $amount_basket = $amount;
Index: /views/warenkorb/ajaxDialog.phtml
===================================================================
--- /views/warenkorb/ajaxDialog.phtml	(revision 7306)
+++ /views/warenkorb/ajaxDialog.phtml	(revision 7307)
@@ -18,7 +18,8 @@
 		$image = $arImages[0];
 	}
-
+	
+	$this->basket->initFromSession(true);
 	$arBasket = $this->basket->toArray();
-
+	
 ?> 	 
 
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 7306)
+++ /views/warenkorb/basket.phtml	(revision 7307)
@@ -328,5 +328,4 @@
 					</div>
 				</div>
-<?php wpsg_debug($this->view['basket']['mwst']); ?>
 
 				<?php foreach ($this->view['basket']['mwst'] as $mwst) { ?>