diff --git a/library/Rediska.php b/library/Rediska.php
index eacc1b6..dec232e 100644
--- a/library/Rediska.php
+++ b/library/Rediska.php
@@ -1,9 +1,12 @@
 <?php
 
-// Register autoloader
+spl_autoload_unregister(array('YiiBase','autoload'));
+
 require_once dirname(__FILE__) . '/Rediska/Autoloader.php';
 Rediska_Autoloader::register();
 
+spl_autoload_register(array('YiiBase', 'autoload'));
+
 /**
  * Rediska (radish on russian) - PHP client 
  * for key-value database Redis (http://code.google.com/p/redis)
diff --git a/library/Rediska/Serializer/Adapter/Json.php b/library/Rediska/Serializer/Adapter/Json.php
index 0a02d91..487854e 100644
--- a/library/Rediska/Serializer/Adapter/Json.php
+++ b/library/Rediska/Serializer/Adapter/Json.php
@@ -83,16 +83,18 @@ public function serialize($value)
      * Unserialize value
      *
      * @param mixed $value
-     * @return string
+     * @return array
      */
     public function unserialize($value)
     {
-        $decodedValue = json_decode($value);
+        $decodedValue = json_decode($value, true);
 
-        if ($decodedValue === null && $value !== 'null') {
+        if ($decodedValue === null && $value !== 'null' || json_last_error() != JSON_ERROR_NONE) {
             throw new Rediska_Serializer_Adapter_Exception("Can't unserialize value");
         }
-
-        return $value;
+        
+        if (is_array($decodedValue)) return $decodedValue;
+        
+        return $value;              
     }
-}
\ No newline at end of file
+}