diff --git a/src/Registry.php b/src/Registry.php
index fa97f0c..cd14297 100644
--- a/src/Registry.php
+++ b/src/Registry.php
@@ -61,7 +61,7 @@ public function get(string $name)
     /**
      * @param string $name
      * @return object
-     * @throws Exception
+     * @throws RegistryException
      */
     public function register(string $name)
     {
@@ -84,7 +84,7 @@ public function remove(string $name): bool
     /**
      * @param string $name
      * @return boolean
-     * @throws Exception
+     * @throws RegistryException
      */
     public function reload(string $name): bool
     {
@@ -92,35 +92,35 @@ public function reload(string $name): bool
             $className = get_class($this->get($name));
             return $this->set($name, new $className);
         } else {
-            throw new \RuntimeException("Class '$name' not registered");
+            throw new RegistryException("Class '$name' not registered");
         }
     }
 
     /**
      * @param object $value
      * @return boolean
-     * @throws Exception
+     * @throws RegistryException
      */
     private function isObject($value): bool
     {
         if (is_object($value)) {
             return true;
         } else {
-            throw new \RuntimeException('Object not exists');
+            throw new RegistryException('Object not exists');
         }
     }
 
     /**
      * @param string $name
      * @return boolean
-     * @throws Exception
+     * @throws RegistryException
      */
     private function classExists(string $name): bool
     {
         if (class_exists($name)) {
             return true;
         } else {
-            throw new \RuntimeException("Class '$name' not exists");
+            throw new RegistryException("Class '$name' not exists");
         }
     }
 }
diff --git a/src/RegistryException.php b/src/RegistryException.php
new file mode 100644
index 0000000..f08c476
--- /dev/null
+++ b/src/RegistryException.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * phpDocumentor
+ *
+ * PHP Version 7.0
+ *
+ * @copyright 2015 Tomasz Ignaszak
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ */
+declare(strict_types=1);
+
+namespace Ignaszak\Registry;
+
+class RegistryException extends \Exception
+{
+
+    public function __construct(string $message, int $code = 0)
+    {
+        parent::__construct($message, $code);
+    }
+}
diff --git a/src/RegistryFactory.php b/src/RegistryFactory.php
index 2059343..b3cf57d 100644
--- a/src/RegistryFactory.php
+++ b/src/RegistryFactory.php
@@ -47,7 +47,7 @@ public static function start(string $registry = 'request'): Registry
     /**
      *
      * @param string $registry
-     * @throws \InvalidArgumentException
+     * @throws RegistryException
      * @return \Ignaszak\Registry\Scope\IRegistry
      */
     private static function getRegistryInstance(string $registry): IRegistry
@@ -62,7 +62,7 @@ private static function getRegistryInstance(string $registry): IRegistry
             case 'file':
                 return new Scope\FileRegistry();
             default:
-                throw new \InvalidArgumentException('Incorrect argument');
+                throw new RegistryException('Incorrect argument');
         }
     }
 }
diff --git a/tests/RegistryFactoryTest.php b/tests/RegistryFactoryTest.php
index 75c15f5..4c3b60e 100644
--- a/tests/RegistryFactoryTest.php
+++ b/tests/RegistryFactoryTest.php
@@ -71,7 +71,7 @@ public function testGetFileInstance()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * @expectedException \Ignaszak\Registry\RegistryException
      */
     public function testStartException()
     {
diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php
index 6d765a1..34e2853 100644
--- a/tests/RegistryTest.php
+++ b/tests/RegistryTest.php
@@ -81,7 +81,7 @@ public function testRegisterNew()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Ignaszak\Registry\RegistryException
      */
     public function testRegisterException()
     {
@@ -105,7 +105,7 @@ public function testRemove()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Ignaszak\Registry\RegistryException
      */
     public function testReloadNonAddedClass()
     {
@@ -140,7 +140,7 @@ public function testIsObject()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Ignaszak\Registry\RegistryException
      */
     public function testIsObjectException()
     {
@@ -154,7 +154,7 @@ public function testClassExists()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Ignaszak\Registry\RegistryException
      */
     public function testClassExistsException()
     {
diff --git a/tests/Scope/FileRegistryTest.php b/tests/Scope/FileRegistryTest.php
index 38a5dc7..b18658c 100644
--- a/tests/Scope/FileRegistryTest.php
+++ b/tests/Scope/FileRegistryTest.php
@@ -35,7 +35,7 @@ public function testSetAgain()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Ignaszak\Registry\RegistryException
      */
     public function testCantCreateTmpFolder()
     {
@@ -45,7 +45,7 @@ public function testCantCreateTmpFolder()
     }
 
     /**
-     * @expectedException \RuntimeException
+     * @expectedException \Ignaszak\Registry\RegistryException
      */
     public function testCantSave()
     {