Index: branches/Abonament/Wierszowki/Wierszowki.Services/MagazineItemService.cs
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Services/MagazineItemService.cs (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Services/MagazineItemService.cs (revision 839)
@@ -28,5 +28,5 @@
         public MagazineItem Find(int id)
         {
-            return _repository.Find(id).Single();
+            return _repository.Find(id).SingleOrDefault();            
         }
 
@@ -35,5 +35,10 @@
             var errors = DataAnnotationsValidationRunner.GetErrors(magazineItem);
             if (errors.Any())
+            {
                 throw new RulesException(errors);
+            }
+            var errors1 = new List<ErrorInfo>();
+            errors1 = ShowError(magazineItem);
+            if (errors1.Count() > 0) throw new RulesException(errors1.AsEnumerable()); 
 
             var user = _userRepository.FindOne(u => u.Login == currentUser);
@@ -43,6 +48,20 @@
             magazineItem.UpdatedBy = user.Id;
             magazineItem.UpdatedOn = now;
+            
+            _repository.Insert(magazineItem);
+            
+        }
 
-            _repository.Insert(magazineItem);
+        private List<ErrorInfo> ShowError(MagazineItem magazineItem)
+        {
+            var errors1 = new List<ErrorInfo>();
+            if (magazineItem.IssueId <= 0)          
+            {
+                ErrorInfo e1 = new ErrorInfo("Magazine", "Proszę wybrać gazetę!");
+                errors1.Add(e1);
+                ErrorInfo e = new ErrorInfo("IssueId", "Proszę wybrać numer wydania!");
+                errors1.Add(e);            
+            }
+            return errors1;
         }
 
@@ -53,8 +72,13 @@
                 throw new RulesException(errors);
 
+            var errors1 = new List<ErrorInfo>();
+            errors1 = ShowError(magazineItem);
+            if (errors1.Count() > 0) throw new RulesException(errors1.AsEnumerable());
+                         
+
             var user = _userRepository.FindOne(u => u.Login == currentUser);
             var now = DateTime.Now;
 
-            var magazineItemToUpdate = _repository.FindOne(magazineItem.Id);
+            var magazineItemToUpdate = _repository.FindOne(magazineItem.Id);           
             magazineItemToUpdate.AuthorId = magazineItem.AuthorId;
             magazineItemToUpdate.Bonus = magazineItem.Bonus;
@@ -70,4 +94,12 @@
             _repository.Update(magazineItemToUpdate);
         }
+        public void Delete(MagazineItem magazineItem)
+        {
+            var magazineItemToDelete = _repository.FindOne(magazineItem.Id);
+            if (magazineItemToDelete != null)
+            {
+                _repository.Delete(magazineItemToDelete);
+    }
+        }
     }
 }
Index: branches/Abonament/Wierszowki/Wierszowki.Services/UserService.cs
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Services/UserService.cs (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Services/UserService.cs (revision 839)
@@ -65,5 +65,5 @@
         public User Find(int id)
         {
-            return _repository.Find(id).Single();
+            return _repository.Find(id).SingleOrDefault();
         }
 
Index: branches/Abonament/Wierszowki/Wierszowki.Services/AuthorService.cs
===================================================================
--- branches/Abonament/Wierszowki/Wierszowki.Services/AuthorService.cs (revision 752)
+++ branches/Abonament/Wierszowki/Wierszowki.Services/AuthorService.cs (revision 839)
@@ -8,4 +8,5 @@
 namespace Wierszowki.Services
 {
+    
     public class AuthorService : BaseService
     {
@@ -15,10 +16,10 @@
             if (errors.Any())
                 throw new RulesException(errors);
-            
+
             var authorToUpdate = DataContext.GetAuthorById(author.Id);
             authorToUpdate.FirstName = author.FirstName;
             authorToUpdate.LastName = author.LastName;
             authorToUpdate.EmploymentTypeId = author.EmploymentTypeId;
-            DataContext.SubmitChanges();
+            DataContext.SubmitChanges();                     
         }
 
