diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master
index c88e312912b8ada6b66bd4d2d515e5b34143d3c0..c89f8758833b7dfeb5f7a3ed1ae4860431291759 100644
--- a/install/tpl/amavisd_user_config.master
+++ b/install/tpl/amavisd_user_config.master
@@ -47,7 +47,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
 $final_virus_destiny = D_BOUNCE;
 $final_spam_destiny = D_DISCARD;
 $final_banned_destiny = D_BOUNCE;
-$final_bad_header_destiny = D_DISCARD;
+$final_bad_header_destiny = D_PASS;
 
 # Default settings, we st this very high to not filter aut emails accidently
 $sa_spam_subject_tag = '***SPAM*** ';
diff --git a/install/tpl/fedora_amavisd_conf.master b/install/tpl/fedora_amavisd_conf.master
index 2a20433547357d5b44065c628f889ca543a40b8b..01d20691a003d57e58583f968bbe53405a5f5ab3 100644
--- a/install/tpl/fedora_amavisd_conf.master
+++ b/install/tpl/fedora_amavisd_conf.master
@@ -775,7 +775,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
 $final_virus_destiny = D_BOUNCE;
 $final_spam_destiny = D_DISCARD;
 $final_banned_destiny = D_BOUNCE;
-$final_bad_header_destiny = D_DISCARD;
+$final_bad_header_destiny = D_PASS;
 
 #
 # Disable spam and virus notifications for the admin user.
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 457693b5058653396025c2ae0bc9f5075723bc94..e0ac82f150b75277503ed2b07261b10be0c1828b 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -68,7 +68,7 @@ class app {
 			$cl = explode(',',$classes);
 			if(is_array($cl)) {
 				foreach($cl as $classname) {
-					if(!is_object($this->$classname)) {
+					if(!@is_object($this->$classname)) {
 						if(is_file($conf['classpath'] . "/".$classname.".inc.php") && !is_link($conf['classpath'] . "/".$classname.".inc.php")) {
 							include_once($conf['classpath'] . "/".$classname.".inc.php");
 							$this->$classname = new $classname;