diff --git a/dibi/Nette/DibiNetteExtension.php b/dibi/Nette/DibiNetteExtension.php
index a19f5803..90721065 100644
--- a/dibi/Nette/DibiNetteExtension.php
+++ b/dibi/Nette/DibiNetteExtension.php
@@ -23,7 +23,7 @@ class DibiNetteExtension extends Nette\Config\CompilerExtension
 
 	public function loadConfiguration()
 	{
-		$container = $this->getContainer();
+		$container = $this->getContainerBuilder();
 		$config = $this->getConfig();
 
 		$useProfiler = isset($config['profiler'])
diff --git a/dibi/dibi.php b/dibi/dibi.php
index 969a0511..a767bf65 100644
--- a/dibi/dibi.php
+++ b/dibi/dibi.php
@@ -37,7 +37,6 @@ require_once dirname(__FILE__) . '/libs/DibiDatabaseInfo.php';
 require_once dirname(__FILE__) . '/libs/DibiEvent.php';
 require_once dirname(__FILE__) . '/libs/DibiFileLogger.php';
 require_once dirname(__FILE__) . '/libs/DibiFirePhpLogger.php';
-require_once dirname(__FILE__) . '/Nette/DibiNettePanel.php';
 
 
 
diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index 80ae4751..1e3778f1 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -119,8 +119,10 @@ class DibiConnection extends DibiObject
 				$this->onEvent[] = array(new DibiFirePhpLogger($filter), 'logEvent');
 			}
 
-			$panel = new DibiNettePanel(isset($profilerCfg['explain']) ? $profilerCfg['explain'] : TRUE, $filter);
-			$panel->register($this);
+			if (interface_exists('Nette\Diagnostics\IBarPanel') || interface_exists('IBarPanel')) {
+				$panel = new DibiNettePanel(isset($profilerCfg['explain']) ? $profilerCfg['explain'] : TRUE, $filter);
+				$panel->register($this);
+			}
 		}
 
 		$this->substitutes = new DibiHashMap(create_function('$expr', 'return ":$expr:";'));