diff --git a/includes/entityreference.usermerge.inc b/includes/entityreference.usermerge.inc
index 6a5f659..97484c7 100644
--- a/includes/entityreference.usermerge.inc
+++ b/includes/entityreference.usermerge.inc
@@ -155,7 +155,5 @@ function _entityreference_usermerge_get_referencing_entity_types() {
     }
   }
 
-  if ( count($referencing_entity_types) ) {
-    return $referencing_entity_types;
-  }
-}
\ No newline at end of file
+  return $referencing_entity_types;
+}
diff --git a/usermerge.module b/usermerge.module
index ae8e3e6..194fc3a 100644
--- a/usermerge.module
+++ b/usermerge.module
@@ -204,9 +204,12 @@ function usermerge_merge_form_validate($form, &$form_state) {
       form_set_error('usermerge_user', 'You cannot have the same username in both fields.');
     }
 
+    $user_to_delete = user_load_multiple(array(), array('name' => $form_state['values']['usermerge_user_delete']));
+    $user_to_keep = user_load_multiple(array(), array('name' => $form_state['values']['usermerge_user_keep']));
+
     // Load up the users. We store these in the form_state['values'] so that we don't have to load again later.
-    $form_state['values']['user_to_delete'] = array_shift(user_load_multiple(array(), array('name' => $form_state['values']['usermerge_user_delete'])));
-    $form_state['values']['user_to_keep'] = array_shift(user_load_multiple(array(), array('name' => $form_state['values']['usermerge_user_keep'])));
+    $form_state['values']['user_to_delete'] = array_shift($user_to_delete);
+    $form_state['values']['user_to_keep'] = array_shift($user_to_keep);
 
     // Use the validate helper function.
     usermerge_validate_merge($form_state['values']['user_to_delete'], $form_state['values']['user_to_keep']);
diff --git a/usermerge.usermerge.inc b/usermerge.usermerge.inc
index 898d1a9..a141c82 100644
--- a/usermerge.usermerge.inc
+++ b/usermerge.usermerge.inc
@@ -193,8 +193,8 @@ function usermerge_usermerge_build_review_form_elements($review, $account_proper
           $review[$property_type][$property_name]['options'] = array(
             '#type' => 'radios',
             '#options' => array(
-              'user_to_delete' => $field_user_to_delete,
-              'user_to_keep' => $field_user_to_keep,
+              'user_to_delete' => is_string($field_user_to_delete) ? $field_user_to_delete : '',
+              'user_to_keep' => is_string($field_user_to_keep) ? $field_user_to_keep : '',
             ),
           );
 
@@ -409,4 +409,4 @@ function usermerge_usermerge_merge_accounts($user_to_delete, $user_to_keep, $rev
   }
 
   return $merged_account;
-}
\ No newline at end of file
+}