diff --git a/coder_upgrade/conversions/coder_upgrade.list.inc b/coder_upgrade/conversions/coder_upgrade.list.inc
index fb5eb940ab40c68674c50f21c4a511a7d018f347..1fbfd0a8ae485c257cabaa79b935e50fb470f984 100644
--- a/coder_upgrade/conversions/coder_upgrade.list.inc
+++ b/coder_upgrade/conversions/coder_upgrade.list.inc
@@ -52,11 +52,11 @@ function coder_upgrade_conversions_list() {
 
   $list['middle'] = array(
     array(
-      'name' => 'functions',
+      'name' => 'function_calls',
       'type' => 'parser',
     ),
     array(
-      'name' => 'function_calls',
+      'name' => 'functions',
       'type' => 'parser',
     ),
     array(
@@ -65,7 +65,7 @@ function coder_upgrade_conversions_list() {
     ),
   );
 
-  $list['end'] = array(/*'end'*/);
+  $list['end'] = array('end');
 
   return $list;
 }
diff --git a/coder_upgrade/conversions/coder_upgrade.other.inc b/coder_upgrade/conversions/coder_upgrade.other.inc
index 70e7f35971178d342e596b9d87ffa8c2e0ceeb32..e4a3b5499b2834a9a8e59df5709357197fd614b7 100644
--- a/coder_upgrade/conversions/coder_upgrade.other.inc
+++ b/coder_upgrade/conversions/coder_upgrade.other.inc
@@ -721,19 +721,20 @@ function coder_upgrade_callback_function_calls(&$item, &$reader) {
       $value = &$return['value'];
       $array = $value->getElement(0);
       if (get_class($array) == 'PGPArray') {
-        $theme = $array->findValue($item->getParameter(0)->toString());
+        if (!($theme = $array->findValue($item->getParameter(0)->toString()))) {
+          coder_upgrade_debug_print("ERROR: theme entry not found in hook_theme");
+          return;
+        }
         $array = $theme->getElement(0);
         $arguments = $array->findValue("'arguments'");
         $keys = $arguments->getElement(0)->keysToArray();
         if (empty($keys)) {
           break;
         }
-        print_r($keys);
         // Remove the quotes surrounding the keys.
         foreach ($keys as $index => $key) {
           $keys[$index] = trim($key, "'\"");
         }
-        print_r($keys);
       }
 
       $count = $item->parameters->count();
@@ -1081,7 +1082,6 @@ function coder_upgrade_convert_access(&$node) {
  */
 function coder_upgrade_convert_install($node) {
   coder_upgrade_debug_echo("inside " . __FUNCTION__ . "\n");
-  coder_upgrade_debug_echo($name . "\n");
   $item = &$node->data;
 
   // Get body statements.