diff --git a/seo_friend.module b/seo_friend.module
index b1e28b5..77d5482 100644
--- a/seo_friend.module
+++ b/seo_friend.module
@@ -429,7 +429,7 @@ function seo_friend_form_alter(&$form, $form_state, $form_id) {
  */
 function seo_friend_form_validate($form, &$form_state) {
   // only validate if saving the form, not in preview or delete
-  if ($form_state['op'] == 'Save') {
+  if ($form_state['values']['op'] == t('Save')) {
     $node = $form['#node'];
     if ($node) {
       seo_friend_text_validate($form, $form_state, $node->type, 'nodewords');
@@ -489,7 +489,7 @@ function seo_friend_text_validate($form, &$form_state, $type, $module) {
   if (! empty($tags)) {
     foreach ($tags as $tag) {
       if ($module == 'nodewords') {
-        $tag_value = trim($form_state['values']['nodewords'][$tag]);
+        $tag_value = trim($form_state['values']['nodewords'][$tag]['value']);
         $fieldset = 'nodewords';
       }
       else {
