Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7458)
+++ /controller/wpsg_ShopController.class.php	(revision 7459)
@@ -20,6 +20,6 @@
 
 		/** Alle Versandkosten der aktivierten Module */
-		var $arShipping;
-		var $arShippingAll;
+		var $arShipping = null;
+		var $arShippingAll = null;
 
 		/** Versandarten wurden schon zusammengefÃŒhrt */
@@ -1867,5 +1867,5 @@
 		 * Gibt das Standardland als wpsg_country Objekt zurÃŒck
 		 * @param $id bool Wenn true dann wird nur die ID zurÃŒckgegeben fÃŒr schnelle Vergleiche
-         * @return wpsg_country
+         * @return wpsg_country|boolean
 		 */
 		public function getDefaultCountry($id = false)
@@ -1877,6 +1877,5 @@
 			if ($country_id === false) return false;
 
-			if ($id === false)
-			{
+			if ($id === false) {
 
 				$default_country = wpsg_country::getInstance($country_id);
@@ -1884,7 +1883,5 @@
 				return $default_country;
 
-			}
-			else
-			{
+			} else {
 
 				return $country_id;
@@ -2720,6 +2717,5 @@
 					{
 
-					    if (property_exists($mod, 'version') && @$mod->free !== true)
-                        {
+					    if (property_exists($mod, 'version') && (property_exists($mod, 'free') && $mod->free !== true)) {
 
                             $wpsg_update_data = wpsg_get_update_data();
@@ -3155,11 +3151,14 @@
 		 * LÀdt die Zahlungs- und Versandmethoden in den Shop Array
 		 */
-		public function addShipPay()
-		{
-
-			$this->callMods('addShipping', array(&$this->arShipping));
-			$this->callMods('addPayment', array(&$this->arPayment));
-
-            $this->callMods('addShipping', array(&$this->arShippingAll, true));
+		public function addShipPay() {
+
+			if ($this->arShipping === null && $this->arPayment === null) { 
+			
+				$this->callMods('addShipping', array(&$this->arShipping));
+				$this->callMods('addPayment', array(&$this->arPayment));
+	
+				$this->callMods('addShipping', array(&$this->arShippingAll, true));
+				
+			}
             
 		} // public function addShipPay()
@@ -3219,9 +3218,7 @@
 		} // public function template_redirect()
 
-		public function wp_load()
-		{
-
-			if (is_admin())
-            {
+		public function wp_load() {
+			
+			if (is_admin()) {
 
                 $this->addShipPay();
Index: /controller/wpsg_SystemController.class.php
===================================================================
--- /controller/wpsg_SystemController.class.php	(revision 7458)
+++ /controller/wpsg_SystemController.class.php	(revision 7459)
@@ -274,5 +274,5 @@
 			
 			// Wenn schon drin, dann nichts machen
-            if (@array_key_exists($message_key, (array)$_SESSION['wpsg']['backendError'])) return;
+            if (@array_key_exists($message_key, wpsg_getArray($_SESSION['wpsg']['backendError']))) return;
 
             if (substr($message, 0, 7) === 'nohspc_') $message = substr($message, 7);
Index: /lib/filter_functions.inc.php
===================================================================
--- /lib/filter_functions.inc.php	(revision 7458)
+++ /lib/filter_functions.inc.php	(revision 7459)
@@ -498,9 +498,12 @@
         $wpsg_update_data = wpsg_get_update_data();
 
-        if (is_object($wpsg_update_data['updateData']) && @$wpsg_update_data['updateData']->scalar !== false && @$wpsg_update_data['updateData']->noUpdate !== true) $data->response[WPSG_SLUG] = $wpsg_update_data['updateData'];
+        if (is_object($wpsg_update_data['updateData']) && property_exists($wpsg_update_data['updateData'], 'scalar')) $scalar = $wpsg_update_data['updateData']->scalar; else $scalar = false;
+		if (is_object($wpsg_update_data['updateData']) && property_exists($wpsg_update_data['updateData'], 'noUpdate')) $noUpdate = $wpsg_update_data['updateData']->noUpdate; else $noUpdate = false;
+        
+        if (is_object($wpsg_update_data['updateData']) && $scalar !== false && $noUpdate !== true) $data->response[WPSG_SLUG] = $wpsg_update_data['updateData'];
         else unset($data->response[WPSG_SLUG]);
     
         return $data;
-    
+      
     }
     
Index: /model/wpsg_model.class.php
===================================================================
--- /model/wpsg_model.class.php	(revision 7458)
+++ /model/wpsg_model.class.php	(revision 7459)
@@ -86,11 +86,9 @@
 		 * @return static
 		 */
-		public static function getInstance($id, $noCache = false)
-		{
-			
+		public static function getInstance($id, $noCache = false) {
+						
 			$class_name = get_called_class();
 			
-			if (wpsg_isSizedArray($id))
-			{
+			if (wpsg_isSizedArray($id)) {
 				
 				$arReturn = [];
@@ -105,8 +103,6 @@
 				return $arReturn;
 				
-			}
-			else if (is_array($id)) return array();
-			else
-			{
+			} else if (is_array($id)) return array();
+			else {
 				
 				if (!isset(self::$_objCache[$class_name]) || !array_key_exists($id, self::$_objCache[$class_name]) || $noCache === true)
Index: /views/mods/mod_creditcard/paymenthint.phtml
===================================================================
--- /views/mods/mod_creditcard/paymenthint.phtml	(revision 7458)
+++ /views/mods/mod_creditcard/paymenthint.phtml	(revision 7459)
@@ -12,9 +12,10 @@
 		<label>
 			<?php echo __('Typ der Kreditkarte', 'wpsg'); ?><span class="wpsg_required">*</span>:
-			<!-- <input class="<?php echo ((in_array("mod_creditcard_typ", 
-				(array)$this->view['error']))?'wpsg_error':''); ?>" 
+			
+			<input 
+				class="<?php echo ((in_array("mod_creditcard_typ",wpsg_getArray($this->view['error'])))?'wpsg_error':''); ?>" 
 				type="text" name="wpsg_mod_creditcard[typ]" 
 				value="<?php echo wpsg_hspc($this->view['wpsg_mod_creditcard']['typ']); ?>" />
-			-->
+			
 			<select name="wpsg_mod_creditcard[typ]" id="wpsg_mod_creditcard_typ" 
 			class="<?php echo ((in_array('mod_creditcard_typ', (array)$this->view['error']))?'wpsg_error':''); ?>" >