Notice trying to access to language object

Problem/Motivation

For some unknown reason, it is possible that "$options['language']" exists but is NULL in locale.inc file. This returns the following error.

Notice: Trying to get property of non-object in locale_language_url_rewrite_url() (line 429 of /var/www/html/includes/locale.inc).

locale.inc

  elseif (!isset($languages[$options['language']->language])) {
    unset($options['language']);
    return;
  }

Proposed resolution

Make sure that the variable is a valid object.

elseif (!is_object($options['language']) || (property_exists($options['language'], 'language') && !isset($languages[$options['language']->language]))) {