Index: openacs-4/packages/faq/www/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/faq/www/one-faq.tcl	7 Aug 2017 23:48:10 -0000	1.12
+++ openacs-4/packages/faq/www/one-faq.tcl	20 Jan 2018 23:16:24 -0000	1.13
@@ -43,9 +43,9 @@
     if { $category_id ne "" } {
 	set category_name [category::get_name $category_id]
 	if { $category_name eq "" } {
-	    ad_return_exception_page 404 "No such category" "Site-wide \
-          Category with ID $category_id doesn't exist"
-            return
+	    ad_return_exception_page 404 "No such category" \
+                "Site-wide Category with ID $category_id doesn't exist"
+            ad_script_abort
 	}
 
 	# Replace last element of context (the FAQ name) with link to that FAQ and current category name
Index: openacs-4/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/forums/tcl/messages-procs.tcl	7 Aug 2017 23:48:11 -0000	1.47
+++ openacs-4/packages/forums/tcl/messages-procs.tcl	20 Jan 2018 23:24:43 -0000	1.48
@@ -61,12 +61,13 @@
         if {$original_message_id ne ""} {
     	# The was a non-null message_id argument
             if {[db_string message_exists_p {}]} {
-    	    return $message_id
+                return $message_id
             } else {
                 # OK - it wasn't a simple double-click, so bomb
                 ad_return_error \
                     "OACS Internal Error" \
                     "Error in forums::message::new - $errmsg"
+                ad_script_abort
             }
         }
     }