diff --git a/plugins/context_admin/node_create_menu.inc b/plugins/context_admin/node_create_menu.inc
index e6766f9..b5482e1 100644
--- a/plugins/context_admin/node_create_menu.inc
+++ b/plugins/context_admin/node_create_menu.inc
@@ -13,7 +13,7 @@ $plugin = array(
 );
 
 
-function context_admin_node_create_menu_content_form(&$form, &$form_state, $cache = NULL) {
+function context_admin_node_create_menu_content_form($form, $form_state, $cache = NULL) {
   ctools_include('dependent');
   $context_options = $form['context']['#options'];
   unset($context_options['empty']);
diff --git a/plugins/task_handlers/menu_context.inc b/plugins/task_handlers/menu_context.inc
index e0a4c5f..9c8f5d5 100644
--- a/plugins/task_handlers/menu_context.inc
+++ b/plugins/task_handlers/menu_context.inc
@@ -346,7 +346,10 @@ function context_admin_menu_context_edit_content_settings(&$form, &$form_state)
   $plugin = context_admin_get_plugins('context_admin', array('id' => $callback));
   $dir = module_invoke($plugin['module'], 'ctools_plugin_directory', 'context_admin', 'context_admin');
   ctools_include($plugin['name'], $plugin['module'], $dir);
-  $form += module_invoke($plugin['module'] .'_'. $callback, 'content_form', $form, $form_state, $cache);
+  $content_form = module_invoke($plugin['module'] .'_'. $callback, 'content_form', $form, $form_state, $cache);
+  if (is_array($content_form)) {
+    $form += $content_form;
+  }
 }
 
 /**