Index: openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml	4 Mar 2008 16:18:20 -0000	1.20
+++ openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml	12 Jan 2010 17:50:08 -0000	1.21
@@ -40,6 +40,7 @@
   <msg key="nada_theme_name">nada</msg>
   <msg key="Page">Page</msg>
   <msg key="Page_1">Page:</msg>
+  <msg key="Page_not_found">The page you were trying to access does not exists in your portal configuration.</msg>
   <msg key="remove">Remove</msg>
   <msg key="Remove_Empty_Page">Remove Empty Page</msg>
   <msg key="remove_portlet">Remove Portlet</msg>
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.188 -r1.189
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	24 Apr 2009 11:51:20 -0000	1.188
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	12 Jan 2010 17:50:08 -0000	1.189
@@ -264,8 +264,12 @@
     }
 
     # get the portal and layout
-    db_1row portal_select {} -column_array portal
-    set page_id $portal(page_id)
+    if {[db_0or1row portal_select {} -column_array portal]} {
+        set page_id $portal(page_id)
+    } else {
+        ad_return_complaint 1 "[_ new-portal.Page_not_found]"
+        ad_script_abort
+    }
 
     db_foreach element_select {} -column_array entry {
         # put the element IDs into buckets by region...