diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68200ea..fab6c36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
  - Fix #168: Fix spelling in russian language (EvgenyOrekhov)
  - Fix #195: UserCreateService: check if we're from web before setting flash message (maxxer)
  - Enh: Improvements to the admin responsive design (wautvda)
+ - Enh: Replace the deprecated InvalidParamException in ClassMapHelper (TonisOrmisson)
  
 ## 1.1.4 - February 19, 2018
 - Enh: Check enableEmailConfirmation on registration (faenir)
diff --git a/src/User/Helper/ClassMapHelper.php b/src/User/Helper/ClassMapHelper.php
index 3ca99f8..d1043c6 100644
--- a/src/User/Helper/ClassMapHelper.php
+++ b/src/User/Helper/ClassMapHelper.php
@@ -11,7 +11,7 @@
 
 namespace Da\User\Helper;
 
-use yii\base\InvalidParamException;
+use yii\base\InvalidArgumentException;
 
 class ClassMapHelper
 {
@@ -39,7 +39,7 @@ class ClassMapHelper
     /**
      * @param $key
      *
-     * @throws InvalidParamException
+     * @throws \InvalidArgumentException
      * @return mixed
      *
      */
@@ -48,6 +48,6 @@ class ClassMapHelper
         if (array_key_exists($key, $this->map)) {
             return $this->map[$key];
         }
-        throw new InvalidParamException('Unknown model map key: ' . $key);
+        throw new InvalidArgumentException('Unknown model map key: ' . $key);
     }
 }