--- addanother.module.bak	2011-03-10 00:55:38.000000000 +0000
+++ addanother.module	2011-03-10 01:10:40.000000000 +0000
@@ -111,7 +111,7 @@ function addanother_form_node_type_form_
  */
 function addanother_goto($nid) {
   if ($node = node_load($nid)) {
-    drupal_goto('node/add/' . $node->type);
+    drupal_goto('node/add/' . addanother_node_type_url($node->type));
   }
   else {
     drupal_goto('node/add');
@@ -141,7 +141,7 @@ function addanother_form_alter(&$form, $
 function addanother_node_insert($node) {
   if ($node->op == t('Save and add another')) {
     theme('addanother_button_message', array('nid' => $node->nid));
-    drupal_goto('node/add/' . $node->type);
+    drupal_goto('node/add/' . addanother_node_type_url($node->type));
   }
   elseif (user_access('use add another') && variable_get('addanother_message_' . $node->type, FALSE)) {
     theme('addanother_message_message', array('node' => $node));
@@ -149,6 +149,13 @@ function addanother_node_insert($node) {
 }
 
 /**
+ * Returns node type string acceptable for URL.
+ */
+function addanother_node_type_url($type) {
+  return str_replace('_', '-', $type);
+}
+
+/**
  * Impelementation of hook_theme().
  *
  * Concept borrowed from 6.x Submit Again.
@@ -172,7 +179,7 @@ function addanother_theme() {
 function theme_addanother_message_message($variables) {
   $node = $variables['node'];
   $addanother_message = t('Add another <a href="@typeurl">%type</a>.', array(
-      '@typeurl' => url('node/add/' . str_replace('_', '-', $node->type)),
+      '@typeurl' => url('node/add/' . addanother_node_type_url($node->type)),
       '%type' => node_type_get_name($node),
       ));
   drupal_set_message($addanother_message);