Index: /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs
===================================================================
--- /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 934)
+++ /trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 935)
@@ -58,6 +58,6 @@
                 return View("Error1", IsError("error_hash", payer.Id_faktury));
 
-            var merchant = getMerchantInfo(systemKs);          
-
+            var merchant = getMerchantInfo(systemKs);
+           
             var hash = GetHash(newPayment, merchant);
             hash = hash.Replace("\n","");
@@ -76,6 +76,10 @@
             linkOk += "/" + language + ConfigurationManager.AppSettings["LinkOk"];
             linkOk += "/" + newPayment.IDFaktury + "?o=" + orderek;
-            
-            SendRequest(newPayment, hash, merchant, linkFail, linkOk);
+
+            if (merchant != null && !String.IsNullOrEmpty(merchant.merchntId))
+                SendRequest(newPayment, hash, merchant, linkFail, linkOk);
+            else 
+                return View("Error1", IsError("error_hash", payer.Id_faktury));
+
             return new EmptyResult();          
         }        
@@ -118,5 +122,5 @@
             var platnosc = _repPayment.Find(i => i.ORDERDESCRIPTION == p.ORDERDESCRIPTION && i.IDFaktury == p.IDFaktury && i.Data == p.Data).First();
 
-            if (platnosc == null) return HASH_ERROR_INFO;
+            if (platnosc == null || merchant == null) return HASH_ERROR_INFO;
 
             var adres = "https://pay.ecard.pl/servlet/HS?orderNumber=" + platnosc.ORDERNUMBER;