Merge remote-tracking branch 'origin/master'

Author: daniel

src/Traits/EncryptableDbAttribute.php

@@ -2,7 +2,8 @@
 
 namespace betterapp\LaravelDbEncrypter\Traits;
 
-use Exception;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Contracts\Encryption\EncryptException;
 use Illuminate\Support\Facades\Crypt;
 
 /**
@@ -29,7 +30,7 @@ public function getAttributeValue($key)
         }
 
         // decrypt value before casts
-        if (in_array($key, $this->encryptable)) {
+        if (in_array($key, $this->encryptable) && !is_null($value) && $value !== '') {
             $value = $this->decrypt($value);
         }
 
@@ -130,7 +131,7 @@ private function encrypt($value)
     {
         try {
             $value = Crypt::encrypt($value);
-        } catch (Exception $e) {}
+        } catch (EncryptException $e) {}
 
         return $value;
     }
@@ -144,7 +145,7 @@ private function decrypt($value)
     {
         try {
             $value = Crypt::decrypt($value);
-        } catch (Exception $e) {}
+        } catch (DecryptException $e) {}
 
         return $value;
     }