diff --git a/dibi/libs/DibiException.php b/dibi/libs/DibiException.php
index 5da60dff..98ae10b5 100644
--- a/dibi/libs/DibiException.php
+++ b/dibi/libs/DibiException.php
@@ -80,7 +80,7 @@ class DibiException extends Exception implements /*Nette\*/IDebugPanel
 	 */
 	public function getPanel()
 	{
-		return dibi::dump($this->sql, TRUE);
+		return $this->sql ? dibi::dump($this->sql, TRUE) : NULL;
 	}
 
 
diff --git a/dibi/libs/DibiProfiler.php b/dibi/libs/DibiProfiler.php
index 14a97ec0..86a41c94 100644
--- a/dibi/libs/DibiProfiler.php
+++ b/dibi/libs/DibiProfiler.php
@@ -45,7 +45,7 @@ class DibiProfiler extends DibiObject implements IDibiProfiler, /*Nette\*/IDebug
 
 	public function __construct()
 	{
-		if (class_exists(/*Nette\*/'Debug', FALSE) && is_callable('Debug::addPanel')) {
+		if (class_exists(/*Nette\*/'Debug', FALSE) && is_callable(/*Nette\*/'Debug::addPanel')) {
 			/*Nette\*/Debug::addPanel($this);
 		}
 
@@ -241,7 +241,7 @@ class DibiProfiler extends DibiObject implements IDibiProfiler, /*Nette\*/IDebug
 		if (!dibi::$numOfQueries) return;
 
 		$content = "
-<h1>SQL queries: " . dibi::$numOfQueries . (dibi::$totalTime === NULL ? '' : ', elapsed time: ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms') . "</h1>
+<h1>Queries: " . dibi::$numOfQueries . (dibi::$totalTime === NULL ? '' : ', time: ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms') . "</h1>
 
 <style>
 	#nette-debug-DibiProfiler td.dibi-sql { background: white }
@@ -249,7 +249,8 @@ class DibiProfiler extends DibiObject implements IDibiProfiler, /*Nette\*/IDebug
 	#nette-debug-DibiProfiler .dibi-sql div { display: none; margin-top: 10px; max-height: 150px; overflow:auto }
 </style>
 
-<table class='nette-inner'>
+<div class='nette-inner'>
+<table>
 <tr>
 	<th>Time</th><th>SQL Statement</th><th>Rows</th><th>Connection</th>
 </tr>
@@ -269,7 +270,7 @@ class DibiProfiler extends DibiObject implements IDibiProfiler, /*Nette\*/IDebug
 </tr>
 ";
 		}
-		$content .= '</table>';
+		$content .= '</table></div>';
 		return $content;
 	}