Index: panels/panels_page/panels_page.admin.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/panels/panels_page/Attic/panels_page.admin.inc,v
retrieving revision 1.1.2.42
diff -u -r1.1.2.42 panels_page.admin.inc
--- panels/panels_page/panels_page.admin.inc	19 May 2008 03:29:38 -0000	1.1.2.42
+++ panels/panels_page/panels_page.admin.inc	19 May 2008 19:19:53 -0000
@@ -159,6 +159,13 @@
 function panels_page_add_page($layout = NULL) {
   $layouts = panels_get_layouts();
 
+  // If the layout given is invalid, unset it.
+  if ($layout && !$layouts[$layout]) {
+    drupal_set_message(t('The chosen layout %layout is invalid. Please select a new one.', array('%layout' => $layout)), 'warning');
+    unset($layout);
+  }
+  // If no page layout is given, choose one first.
   if ($layout === NULL) {
     foreach ($layouts as $id => $layout) {
       $output .= panels_print_layout_link($id, $layout, $_GET['q'] . '/' . $id);
@@ -166,10 +173,6 @@
     return $output;
   }
 
-  if (!$layouts[$layout]) {
-    return drupal_not_found();
-  }
-
   $panel_page->display = panels_new_display();
   $panel_page->display->layout = $layout;
   $panel_page->pid = 'new';