diff --git a/extensions/debug/views/default/index.php b/extensions/debug/views/default/index.php
index dadd7b9317..acd8aaf740 100644
--- a/extensions/debug/views/default/index.php
+++ b/extensions/debug/views/default/index.php
@@ -17,95 +17,102 @@ $this->title = 'Yii Debugger';
 <div class="default-index">
 
 
-    <div id="yii-debug-toolbar" class="yii-debug-toolbar-top">
-        <div class="yii-debug-toolbar-block title">
-            <a href="#">
-                <img width="29" height="30" alt="" src="<?= \yii\debug\Module::getYiiLogo() ?>">
-                Yii Debugger
-            </a>
-        </div>
-        <?php foreach ($panels as $panel): ?>
-            <?= $panel->getSummary() ?>
-        <?php endforeach; ?>
+	<div id="yii-debug-toolbar" class="yii-debug-toolbar-top">
+		<div class="yii-debug-toolbar-block title">
+			<a href="#">
+				<img width="29" height="30" alt="" src="<?= \yii\debug\Module::getYiiLogo() ?>">
+				Yii Debugger
+			</a>
+		</div>
+		<?php foreach ($panels as $panel): ?>
+			<?= $panel->getSummary() ?>
+		<?php endforeach; ?>
 	</div>
 
 	<div class="container">
 		<div class="row">
-			<h1>Available Debug Data</h1>
-
 <?php
 
-$timeFormatter = extension_loaded('intl') ? Yii::createObject(['class' => 'yii\i18n\Formatter']) : Yii::$app->formatter;
+if (isset($this->context->module->panels['db']) && isset($this->context->module->panels['request'])) {
 
-echo GridView::widget([
-	'dataProvider' => $dataProvider,
-	'filterModel' => $searchModel,
-	'rowOptions' => function ($model, $key, $index, $grid) use ($searchModel) {
-		$dbPanel = $this->context->module->panels['db'];
+	echo "			<h1>Available Debug Data</h1>";
+	$timeFormatter = extension_loaded('intl') ? Yii::createObject(['class' => 'yii\i18n\Formatter']) : Yii::$app->formatter;
 
-		if ($searchModel->isCodeCritical($model['statusCode']) || $dbPanel->isQueryCountCritical($model['sqlCount'])) {
-			return ['class'=>'danger'];
-		} else {
-			return [];
-		}
-	},
-	'columns' => [
-		['class' => 'yii\grid\SerialColumn'],
-		[
-			'attribute' => 'tag',
-			'value' => function ($data) {
-				return Html::a($data['tag'], ['view', 'tag' => $data['tag']]);
-			},
-			'format' => 'html',
-		],
-		[
-			'attribute' => 'time',
-			'value' => function ($data) use ($timeFormatter) {
-				return $timeFormatter->asDateTime($data['time'], 'short');
-			},
-		],
-		'ip',
-		[
-			'attribute' => 'sqlCount',
-			'label' => 'Total queries',
-			'value' => function ($data) {
-				$dbPanel = $this->context->module->panels['db'];
+	echo GridView::widget([
+		'dataProvider' => $dataProvider,
+		'filterModel' => $searchModel,
+		'rowOptions' => function ($model, $key, $index, $grid) use ($searchModel) {
+			$dbPanel = $this->context->module->panels['db'];
 
-				if ($dbPanel->isQueryCountCritical($data['sqlCount'])) {
+			if ($searchModel->isCodeCritical($model['statusCode']) || $dbPanel->isQueryCountCritical($model['sqlCount'])) {
+				return ['class'=>'danger'];
+			} else {
+				return [];
+			}
+		},
+		'columns' => [
+			['class' => 'yii\grid\SerialColumn'],
+			[
+				'attribute' => 'tag',
+				'value' => function ($data) {
+					return Html::a($data['tag'], ['view', 'tag' => $data['tag']]);
+				},
+				'format' => 'html',
+			],
+			[
+				'attribute' => 'time',
+				'value' => function ($data) use ($timeFormatter) {
+					return $timeFormatter->asDateTime($data['time'], 'short');
+				},
+			],
+			'ip',
+			[
+				'attribute' => 'sqlCount',
+				'label' => 'Total queries',
+				'value' => function ($data) {
+					$dbPanel = $this->context->module->panels['db'];
 
-					$content = Html::tag('b', $data['sqlCount']) . ' ' . Html::tag('span', '', ['class' => 'glyphicon glyphicon-exclamation-sign']);
-					return Html::a($content, ['view', 'panel' => 'db', 'tag' => $data['tag']], [
-						'title' => 'Too many queries. Allowed count is ' . $dbPanel->criticalQueryThreshold,
-					]);
+					if ($dbPanel->isQueryCountCritical($data['sqlCount'])) {
 
-				} else {
-					return $data['sqlCount'];
-				}
-			},
-			'format' => 'html',
+						$content = Html::tag('b', $data['sqlCount']) . ' ' . Html::tag('span', '', ['class' => 'glyphicon glyphicon-exclamation-sign']);
+						return Html::a($content, ['view', 'panel' => 'db', 'tag' => $data['tag']], [
+							'title' => 'Too many queries. Allowed count is ' . $dbPanel->criticalQueryThreshold,
+						]);
+
+					} else {
+						return $data['sqlCount'];
+					}
+				},
+				'format' => 'html',
+			],
+			[
+				'attribute' => 'method',
+				'filter' => ['get' => 'GET', 'post' => 'POST', 'delete' => 'DELETE', 'put' => 'PUT', 'head' => 'HEAD']
+			],
+			[
+				'attribute'=>'ajax',
+				'value' => function ($data) {
+					return $data['ajax'] ? 'Yes' : 'No';
+				},
+				'filter' => ['No', 'Yes'],
+			],
+			[
+				'attribute' => 'url',
+				'label' => 'URL',
+			],
+			[
+				'attribute' => 'statusCode',
+				'filter' => [200 => 200, 404 => 404, 403 => 403, 500 => 500],
+				'label' => 'Status code'
+			],
 		],
-		[
-			'attribute' => 'method',
-			'filter' => ['get' => 'GET', 'post' => 'POST', 'delete' => 'DELETE', 'put' => 'PUT', 'head' => 'HEAD']
-		],
-		[
-			'attribute'=>'ajax',
-			'value' => function ($data) {
-				return $data['ajax'] ? 'Yes' : 'No';
-			},
-			'filter' => ['No', 'Yes'],
-		],
-		[
-			'attribute' => 'url',
-			'label' => 'URL',
-		],
-		[
-			'attribute' => 'statusCode',
-			'filter' => [200 => 200, 404 => 404, 403 => 403, 500 => 500],
-			'label' => 'Status code'
-		],
-	],
-]); ?>
+	]);
+
+} else {
+	echo "<div class='alert alert-warning'>No data available. Panel <code>db</code> or <code>request</code> not found.</div>";
+}
+
+?>
 		</div>
 	</div>
 </div>
diff --git a/extensions/debug/views/default/panels/db/detail.php b/extensions/debug/views/default/panels/db/detail.php
index ee5b2a5530..682c7946e9 100644
--- a/extensions/debug/views/default/panels/db/detail.php
+++ b/extensions/debug/views/default/panels/db/detail.php
@@ -1,6 +1,7 @@
 <?php
 use yii\helpers\Html;
 use yii\grid\GridView;
+
 ?>
 <h1>Database Queries</h1>
 
diff --git a/extensions/debug/views/default/panels/log/detail.php b/extensions/debug/views/default/panels/log/detail.php
index 6a2893a87d..ccbec5dc7f 100644
--- a/extensions/debug/views/default/panels/log/detail.php
+++ b/extensions/debug/views/default/panels/log/detail.php
@@ -2,6 +2,7 @@
 use yii\helpers\Html;
 use yii\grid\GridView;
 use yii\log\Logger;
+
 ?>
 <h1>Log Messages</h1>
 <?php
diff --git a/extensions/debug/views/default/panels/log/summary.php b/extensions/debug/views/default/panels/log/summary.php
index a8a931b06a..692679d0e9 100644
--- a/extensions/debug/views/default/panels/log/summary.php
+++ b/extensions/debug/views/default/panels/log/summary.php
@@ -1,6 +1,7 @@
 <?php
 use yii\log\Target;
 use yii\log\Logger;
+
 ?>
 
 <?php
diff --git a/extensions/debug/views/default/panels/request/detail.php b/extensions/debug/views/default/panels/request/detail.php
index 56ffe29045..9f5458086c 100644
--- a/extensions/debug/views/default/panels/request/detail.php
+++ b/extensions/debug/views/default/panels/request/detail.php
@@ -5,6 +5,8 @@ use yii\bootstrap\Tabs;
  * @var yii\debug\panels\RequestPanel $panel
  */
 
+echo "<h1>Request</h1>";
+
 echo Tabs::widget([
 	'items' => [
 		[