diff --git a/src/EntityTrait.php b/src/EntityTrait.php
index ddf88fc..2da6dba 100644
--- a/src/EntityTrait.php
+++ b/src/EntityTrait.php
@@ -3,9 +3,9 @@
 
 namespace Selami\Entity;
 
+use Selami\Entity\Exception\InvalidArgumentException;
 use stdClass;
 use Selami\Entity\Interfaces\EntityInterface;
-use Selami\Entity\Exception\UnexpectedValueException;
 
 trait EntityTrait
 {
@@ -37,7 +37,7 @@ public function __unset($name)
     public static function createFromJsonFile(string $filePath, string $id) : EntityInterface
     {
         if (!file_exists($filePath)) {
-            throw new UnexpectedValueException(sprintf('Model definition file (%s) does not exist!', $filePath));
+            throw new InvalidArgumentException(sprintf('Model definition file (%s) does not exist!', $filePath));
         }
         $json = file_get_contents($filePath);
         return static::createFromJson($json, $id);
diff --git a/src/Exception/UnexpectedValueException.php b/src/Exception/UnexpectedValueException.php
deleted file mode 100644
index d1ca7d5..0000000
--- a/src/Exception/UnexpectedValueException.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Selami\Entity\Exception;
-
-class UnexpectedValueException extends \UnexpectedValueException
-{
-
-}
diff --git a/src/Model.php b/src/Model.php
index 4707a16..3a7d771 100644
--- a/src/Model.php
+++ b/src/Model.php
@@ -5,7 +5,7 @@
 
 use stdClass;
 use Opis\JsonSchema\Schema;
-use Selami\Entity\Exception\UnexpectedValueException;
+use Selami\Entity\Exception\InvalidArgumentException;
 
 final class Model
 {
@@ -41,7 +41,7 @@ public function getSchema(?stdClass $model = null)  : Schema
     public static function createFromJsonFile(string $filePath) : Model
     {
         if (!file_exists($filePath)) {
-            throw new UnexpectedValueException(sprintf('Model definition file (%s) does not exist!', $filePath));
+            throw new InvalidArgumentException(sprintf('Model definition file (%s) does not exist!', $filePath));
         }
         return new static(file_get_contents($filePath));
     }
diff --git a/src/ValueObjectTrait.php b/src/ValueObjectTrait.php
index d4a4a84..c2a19ae 100644
--- a/src/ValueObjectTrait.php
+++ b/src/ValueObjectTrait.php
@@ -4,7 +4,7 @@
 namespace Selami\Entity;
 
 use stdClass;
-use Selami\Entity\Exception\UnexpectedValueException;
+use Selami\Entity\Exception\InvalidArgumentException;
 use Selami\Entity\Exception\BadMethodCallException;
 use Selami\Entity\Interfaces\ValueObjectInterface;
 
@@ -32,7 +32,7 @@ final public function __unset($name)
     public static function createFromJsonFile(string $filePath, stdClass $data) : ValueObjectInterface
     {
         if (!file_exists($filePath)) {
-            throw new UnexpectedValueException(sprintf('Model definition file (%s) does not exist!', $filePath));
+            throw new InvalidArgumentException(sprintf('Model definition file (%s) does not exist!', $filePath));
         }
         $json = file_get_contents($filePath);
         return static::createFromJson($json, $data);
diff --git a/tests/unit/EntityTest.php b/tests/unit/EntityTest.php
index 427bbc7..95fad0f 100644
--- a/tests/unit/EntityTest.php
+++ b/tests/unit/EntityTest.php
@@ -111,7 +111,7 @@ public function shouldFailForRequiredInput() : void
 
     /**
      * @test
-     * @expectedException \Selami\Entity\Exception\UnexpectedValueException
+     * @expectedException \Selami\Entity\Exception\InvalidArgumentException
      */
     public function shouldFailForAModelFileDoesNotExist() : void
     {
diff --git a/tests/unit/ModelTest.php b/tests/unit/ModelTest.php
index c223f74..21f25ff 100644
--- a/tests/unit/ModelTest.php
+++ b/tests/unit/ModelTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use Selami\Entity\Model;
-use Selami\Entity\Exception\UnexpectedValueException;
+use Selami\Entity\Exception\InvalidArgumentException;
 
 class ModelTest extends \Codeception\Test\Unit
 {
@@ -40,7 +40,7 @@ public function shouldReturnModelObjectSuccessfully() : void
 
     /**
      * @test
-     * @expectedException UnexpectedValueException
+     * @expectedException InvalidArgumentException
      */
     public function shouldFailForAFileThatDoesNotExist() : void
     {
diff --git a/tests/unit/ValueObjectTest.php b/tests/unit/ValueObjectTest.php
index 0e29a6e..a64bc2b 100644
--- a/tests/unit/ValueObjectTest.php
+++ b/tests/unit/ValueObjectTest.php
@@ -135,7 +135,7 @@ public function shouldFailForRequiredInput() : void
 
     /**
      * @test
-     * @expectedException \Selami\Entity\Exception\UnexpectedValueException
+     * @expectedException \Selami\Entity\Exception\InvalidArgumentException
      */
     public function shouldFailForAModelFileDoesNotExist() : void
     {