diff --git a/modules/metarefresh/bin/metarefresh.php b/modules/metarefresh/bin/metarefresh.php
index fd51caaabb42e9d99ab831037d8544c20b8d7853..2e351f3576d707089476637cd5f9501399bb4597 100755
--- a/modules/metarefresh/bin/metarefresh.php
+++ b/modules/metarefresh/bin/metarefresh.php
@@ -144,8 +144,6 @@ if($toStdOut) {
 	$metaloader->writeMetadataFiles($outputDir);
 }
 
-exit(0);
-
 /**
  * This function prints the help output.
  */
@@ -178,8 +176,3 @@ function printHelp() {
 	echo('                              seperate files in the output directory.' . "\n");
 	echo("\n");
 }
-
-
-
-
-
diff --git a/modules/negotiate/lib/Auth/Source/Negotiate.php b/modules/negotiate/lib/Auth/Source/Negotiate.php
index e956a00edbced318a7efd43913c7ed97f3706276..07893002a1565526ea4966485ceabc334cfa0ce0 100644
--- a/modules/negotiate/lib/Auth/Source/Negotiate.php
+++ b/modules/negotiate/lib/Auth/Source/Negotiate.php
@@ -160,9 +160,7 @@ class sspmod_negotiate_Auth_Source_Negotiate extends SimpleSAML_Auth_Source {
 		if (array_key_exists('negotiate:disable', $spMetadata)) {
 			if ($spMetadata['negotiate:disable'] == TRUE) {
 				SimpleSAML_Logger::debug('Negotiate - SP disabled. falling back');
-				return True;
-				// Never executed
-				assert('FALSE');
+				return true;
 			} else {
 				SimpleSAML_Logger::debug('Negotiate - SP disable flag found but set to FALSE');
 			}