diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/Exceptions/ApiException.php b/src/Skobkin/Bundle/PointToolsBundle/Service/Exceptions/ApiException.php
new file mode 100644
index 0000000..0eb8fd5
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Service/Exceptions/ApiException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Skobkin\Bundle\PointToolsBundle\Service\Exceptions;
+
+
+class ApiException extends \Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/Exceptions/SubscriptionManagerException.php b/src/Skobkin/Bundle/PointToolsBundle/Service/Exceptions/SubscriptionManagerException.php
new file mode 100644
index 0000000..337d64e
--- /dev/null
+++ b/src/Skobkin/Bundle/PointToolsBundle/Service/Exceptions/SubscriptionManagerException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Skobkin\Bundle\PointToolsBundle\Service\Exceptions;
+
+
+class SubscriptionManagerException extends \Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Skobkin/Bundle/PointToolsBundle/Service/UserApi.php b/src/Skobkin/Bundle/PointToolsBundle/Service/UserApi.php
index 4fca586..d8476e2 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/Service/UserApi.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/Service/UserApi.php
@@ -7,6 +7,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Guzzle\Service\Client;
 use Skobkin\Bundle\PointToolsBundle\Entity\User;
+use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\ApiException;
 
 /**
  * Basic Point.im user API functions from /api/user/*
@@ -136,6 +137,12 @@ class UserApi extends AbstractApi
                     $user = new User();
                     $user->setId((int) $userData['id']);
                     $this->em->persist($user);
+
+                    try {
+                        $this->em->flush();
+                    } catch (\Exception $e) {
+                        throw new ApiException(sprintf('Error while flushing new user [%d] %s', $user->getId(), $user->getLogin()), 0, $e);
+                    }
                 }
 
                 // Updating data
@@ -146,12 +153,16 @@ class UserApi extends AbstractApi
                     $user->setName($userData['name']);
                 }
 
+                try {
+                    $this->em->flush();
+                } catch (\Exception $e) {
+                    throw new ApiException(sprintf('Error while flushing changes for [%d] %s', $user->getId(), $user->getLogin()), 0, $e);
+                }
+
                 $resultUsers[] = $user;
             }
         }
 
-        $this->em->flush();
-
         return $resultUsers;
     }