diff --git a/www/_include.php b/www/_include.php
index 2f67ef9740d9a34c37c114722f1b7c975974ae03..53afd4e28a5b1a30405cd9ac4de4be4567a82cf1 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -22,6 +22,9 @@ if(get_magic_quotes_gpc()) {
 /* Initialize the autoloader. */
 require_once(dirname(dirname(__FILE__)) . '/lib/_autoload.php');
 
+/* Enable assertion handler for all pages. */
+SimpleSAML_Error_Assertion::installHandler();
+
 /* Show error page on unhandled exceptions. */
 function SimpleSAML_exception_handler(Exception $exception) {
 	$e = new SimpleSAML_Error_Error('UNHANDLEDEXCEPTION', $exception);
diff --git a/www/module.php b/www/module.php
index 38aa8f377349edaa21b7dd3af4e012315cd8407d..649b95c82f748d6d4bb4bf0256dbeda493eb613b 100644
--- a/www/module.php
+++ b/www/module.php
@@ -12,8 +12,6 @@
 
 require_once('_include.php');
 
-SimpleSAML_Error_Assertion::installHandler();
-
 /* Index pages - filenames to attempt when accessing directories. */
 $indexFiles = array('index.php', 'index.html', 'index.htm', 'index.txt');