diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 8ee3af8e2b..3ac72d916a 100755
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -32,6 +32,8 @@
  *
  */
 
+die();
+
 if (sizeof($_SERVER["argv"]) == 0)
 	die();
 
diff --git a/include/dba.php b/include/dba.php
index 0d983be327..26da115b57 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -635,6 +635,10 @@ class dba {
 	 * @return boolean Was the query successfull?
 	 */
 	static public function e($sql) {
+		$args = func_get_args();
+
+		$stmt = self::p();
+		self::close($stmt);
 	}
 
 	/**
@@ -739,8 +743,6 @@ function dbesc($str) {
 //                   'user', 1);
 function q($sql) {
 	global $db;
-	$args = func_get_args();
-	unset($args[0]);
 
 	if ($db && $db->connected) {
 		$sql = $db->any_value_fallback($sql);