Infinite redirect when using faq_page() with a term ID

The docs say that you can call faq_page() directly to display the FAQs inside of another page. This works, but only if you don't pass in a $tid.

This section is the problem:

if (!empty($tid) && $current_term = taxonomy_term_load($tid)) {
    if (!drupal_lookup_path('alias', arg(0) . '/' . $tid) && module_exists('pathauto')) {
      $alias = pathauto_create_alias('faq', 'insert', arg(0) . '/' . arg(1), array('term' => $current_term));
      if ($alias) {
        drupal_goto($alias['alias']);
      }
    }
    if (drupal_match_path($_GET['q'], 'faq-page/*')) {
      faq_set_breadcrumb($current_term);
    }
  }

I'm calling faq_page(5) on a node with an alias, so the current url is /sample-node-alias. The arg(0) is 'node' and arg(1) is 9 (the nid), so it tries to create an alias to "node/$tid" which is incorrect. Then on the following few lines it uses a different but still incorrect alias pattern, resulting in an infinite loop.

My temporary solution was to disable the section entirely. I don't use the term pages anywhere so the breadcrumb / alias creation is irrelevant.

As for a permanent solution, the aliases created need to be more specific (such as only applying to standard FAQ pages) and consistent with the redirect logic. The whole section could also be skipped if the breadcrumb checkbox is disabled.