diff --git a/includes/media_flickr.utilities.inc b/includes/media_flickr.utilities.inc
index 30c84de..c3e424f 100644
--- a/includes/media_flickr.utilities.inc
+++ b/includes/media_flickr.utilities.inc
@@ -44,8 +44,8 @@ function _media_flickr_photo_remote_url($photo_id, $size) {
  *  @param string $method
  *  @param array $args
  *
- *  @return object
- *    A fully populated SimpleXML object.
+ *  @return array
+ *    A fully SimpleXML object converted to a array or on error, a empty array.
  */
 function _media_flickr_sets_request($method, $args = array()) {
   // Display an error if we don't have an API key yet.
@@ -65,7 +65,6 @@ function _media_flickr_sets_request($method, $args = array()) {
   }
   else {
     throw new Exception("Error Processing Request. (Error: {$request->code}, {$request->error})");
-
     // If request wasn't successful, create object for return to avoid errors.
     $entry = new SimpleXMLElement();
   }
@@ -100,7 +99,7 @@ function _media_flickr_error_check() {
   if (is_null($checked)) {
     if (variable_get('media_flickr_api_key', '') == '') {
       $error = 'You do not yet have a Flickr API key set. You will need to !apply and enter your key at the !settings before Flickr images may be displayed.';
-      $arguments = array('!apply' => l(t('apply for a Flickr API key'), MEDIA_FLICKR_API_APPLICATION_URL), '!settings' => l(t('Flickr administration page'), 'admin/config/media/media_flickr'));
+      $arguments = array('!apply' => l(t('apply for a Flickr API key'), MEDIA_FLICKR_API_APPLICATION_URL), '!settings' => l(t('Flickr administration page'), 'admin/config/media/media-flickr'));
       if (user_access('administer site configuration')) {
         drupal_set_message(t($error, $arguments), 'error');
       }
@@ -196,6 +195,9 @@ function _media_flickr_photoset_exists($photoset_id) {
 
 function _media_flickr_get_user_id($user_id) {
   $info = _media_flickr_sets_request('flickr.people.getInfo', array('user_id' => $user_id));
+  if (empty($info)) {
+    return FALSE;
+  }
 
   if ($info && ($info['@attributes']['stat'] != 'fail')) {
     return $user_id;