diff --git a/core/PluginsFunctions/Sql.php b/core/PluginsFunctions/Sql.php
index 2748ae5db02471d92e0689d76111cdcbc3b1fbd7..f556786cd63fb36f3b360e0b670f92f8b9df8aa6 100644
--- a/core/PluginsFunctions/Sql.php
+++ b/core/PluginsFunctions/Sql.php
@@ -45,9 +45,6 @@ class Piwik_Sql
 	static public function exec($sql)
 	{
 		$db = Zend_Registry::get('db');
-		if (!is_a($db, 'Zend_Db_Adapter_Abstract')) {
-			debug_print_backtrace();
-		}
 		$profiler = $db->getProfiler();
 		$q = $profiler->queryStart($sql, Zend_Db_Profiler::INSERT);
 		$return = self::getDb()->exec($sql);
diff --git a/tests/build-ci.xml b/tests/build-ci.xml
index 27cb0cf5302ca0002069d2492f680446be741eee..c16c29b104c215b5260e86eb821b5698053e7e70 100644
--- a/tests/build-ci.xml
+++ b/tests/build-ci.xml
@@ -1,75 +1,77 @@
 <project name="piwik" default="all" basedir=".">
 
-	<property file="build.properties" />
-	<property file="defaults.properties" />
+    <property file="build.properties"/>
+    <property file="defaults.properties"/>
 
-	<target name="clean">
-		<delete dir="${basedir}/results" />
-	</target>
+    <target name="clean">
+        <delete dir="${basedir}/results"/>
+    </target>
 
-	<target name="prepare-build-filesystem" depends="clean">
-		<mkdir dir="${basedir}/../tmp/templates_c" />
-		<mkdir dir="${basedir}/../tmp/cache" />
-		<mkdir dir="${basedir}/../tmp/latest" />
-		<mkdir dir="${basedir}/../tmp/sessions" />
-		<mkdir dir="${basedir}/../tmp/assets" />
-		
-		<chmod perm="a+rw">
-			<dirset dir="${basedir}/..">
-				<include name="config" />
-				<include name="tmp" />
-				<include name="tmp/**" />
-			</dirset>
-		</chmod>
-	</target>
+    <target name="prepare-build-filesystem" depends="clean">
+        <mkdir dir="${basedir}/../tmp/templates_c"/>
+        <mkdir dir="${basedir}/../tmp/cache"/>
+        <mkdir dir="${basedir}/../tmp/latest"/>
+        <mkdir dir="${basedir}/../tmp/sessions"/>
+        <mkdir dir="${basedir}/../tmp/assets"/>
 
-	<target name="phpunit">
-		<copy file="${basedir}/PHPUnit/phpunit.xml.dist" tofile="${basedir}/PHPUnit/phpunit.xml" overwrite="true">
-			<filterset>
-				<filtersfile file="${basedir}/build.properties"/>
-			</filterset>
-		</copy>
-	</target>
+        <chmod perm="a+rw">
+            <dirset dir="${basedir}/..">
+                <include name="config"/>
+                <include name="tmp"/>
+                <include name="tmp/**"/>
+            </dirset>
+        </chmod>
+    </target>
 
-	<target name="process-build-resources-pdo-mysql" depends="prepare-build-filesystem">
-		<copy file="${basedir}/config/pdo_mysql.template.php" tofile="${basedir}/../config/config.ini.php" overwrite="true">
-			<filterset>
-				<filtersfile file="${basedir}/build.properties"/>
-			</filterset>
-		</copy>	
-	</target>
+    <target name="phpunit">
+        <copy file="${basedir}/PHPUnit/phpunit.xml.dist" tofile="${basedir}/PHPUnit/phpunit.xml" overwrite="true">
+            <filterset>
+                <filtersfile file="${basedir}/build.properties"/>
+            </filterset>
+        </copy>
+    </target>
 
-	<target name="test-pdo-mysql" depends="process-build-resources-pdo-mysql">
-		<echo>PDO_MYSQL unit tests started</echo>
+    <target name="process-build-resources-pdo-mysql" depends="prepare-build-filesystem">
+        <copy file="${basedir}/config/pdo_mysql.template.php" tofile="${basedir}/../config/config.ini.php"
+              overwrite="true">
+            <filterset>
+                <filtersfile file="${basedir}/build.properties"/>
+            </filterset>
+        </copy>
+    </target>
 
-		<exec executable="phpunit" dir="${basedir}/PHPUnit" failonerror="false" failifexecutionfails="true">
+    <target name="test-pdo-mysql" depends="process-build-resources-pdo-mysql">
+        <echo>PDO_MYSQL unit tests started</echo>
+
+        <exec executable="phpunit" dir="${basedir}/PHPUnit" failonerror="false" failifexecutionfails="true">
             <!-- DEBUG: when test crash in the middle, enable this to see which test crashes. Note: remove \ from -\- below -->
-            <!--<arg line=" -\-testdox"/>-->
-		</exec>
+            <arg line=" -\-testdox"/>
+        </exec>
 
-		<echo>PDO_MYSQL unit tests finished</echo>
-	</target>
+        <echo>PDO_MYSQL unit tests finished</echo>
+    </target>
 
-	<target name="process-build-resources-mysqli" depends="prepare-build-filesystem">
-		<copy file="${basedir}/config/mysqli.template.php" tofile="${basedir}/../config/config.ini.php" overwrite="true">
-			<filterset>
-				<filtersfile file="${basedir}/build.properties"/>
-			</filterset>
-		</copy>	
-	</target>
+    <target name="process-build-resources-mysqli" depends="prepare-build-filesystem">
+        <copy file="${basedir}/config/mysqli.template.php" tofile="${basedir}/../config/config.ini.php"
+              overwrite="true">
+            <filterset>
+                <filtersfile file="${basedir}/build.properties"/>
+            </filterset>
+        </copy>
+    </target>
 
-	<target name="test-mysqli" depends="process-build-resources-mysqli">
-		<echo>MYSQLI unit tests started</echo>
+    <target name="test-mysqli" depends="process-build-resources-mysqli">
+        <echo>MYSQLI unit tests started</echo>
 
-		<exec executable="phpunit" dir="${basedir}/PHPUnit" failonerror="false" failifexecutionfails="true">
+        <exec executable="phpunit" dir="${basedir}/PHPUnit" failonerror="false" failifexecutionfails="true">
             <!-- DEBUG: when test crash in the middle, enable this to see which test crashes. Note: Remove \ from -\- below -->
             <!--<arg line="-\-testdox"/>-->
-		</exec>
+        </exec>
 
-		<echo>MYSQLI unit tests finished</echo>
-	</target>
+        <echo>MYSQLI unit tests finished</echo>
+    </target>
 
-	<target name="all" depends="phpunit,test-pdo-mysql,test-mysqli">
-	</target>
+    <target name="all" depends="phpunit,test-pdo-mysql,test-mysqli">
+    </target>
 
 </project>