diff --git a/field_encrypt.cache.inc b/field_encrypt.cache.inc
index cb19e93daefb7035fec3caed9a379c942a9ff9ac..7d0c72ee39d5d87367fefdbaba8ddd951a053e18 100644
--- a/field_encrypt.cache.inc
+++ b/field_encrypt.cache.inc
@@ -25,7 +25,6 @@ class FieldEncryptDatabaseCache extends DrupalDatabaseCache {
    */
   protected function prepareItem($cache) {
     global $user;
-
     if (!isset($cache->data)) {
       return FALSE;
     }
diff --git a/field_encrypt.inc b/field_encrypt.inc
index 48f34d8116d8b3943b412ed41c8dbc8936aab559..29fc9b798b1b4993d89bcb55bc352ebc69fd8310 100644
--- a/field_encrypt.inc
+++ b/field_encrypt.inc
@@ -27,7 +27,9 @@ function field_encrypt_do_encrypt($field_info, $phrase) {
       $insert[$field] = $result->$field;
       unset($result->$field);
     }
-    $insert['value'] = field_encrypt_encrypt(serialize($result), $field_info['settings']['field_encrypt']['phrase']); // encrypt here
+    if (isset($field_info['settings']['field_encrypt'])) {
+      $insert['value'] = field_encrypt_encrypt(serialize($result), $field_info['settings']['field_encrypt']['phrase']); // encrypt here
+    }
     $inserts[] = $insert;
   }