diff --git a/templates/bootstrap/bootstrap-panel.html.twig b/templates/bootstrap/bootstrap-panel.html.twig
index 95a9214..48e5216 100644
--- a/templates/bootstrap/bootstrap-panel.html.twig
+++ b/templates/bootstrap/bootstrap-panel.html.twig
@@ -17,6 +17,7 @@ set classes = [
   required ? 'form-required',
   collapsible ? 'collapsible',
   collapsed ? 'collapsed',
+  errors ? 'form-item--error has-error'
 ]
 %}
 <fieldset{{ attributes.addClass(classes) }}>
@@ -33,6 +34,11 @@ set classes = [
       </legend>
     {% endif %}
   {% endif %}
+  {% if errors %}
+    <div class="form-item--error-message text-danger">
+      {{ errors }}
+    </div>
+  {% endif %}
   {% if collapsible %}
     <div class="panel-collapse collapse fade {{ collapsed == false ? 'in' : '' }}">
   {% endif %}
diff --git a/templates/bootstrap/bootstrap-panel.vars.php b/templates/bootstrap/bootstrap-panel.vars.php
index 5a72fc8..e7e9f1d 100644
--- a/templates/bootstrap/bootstrap-panel.vars.php
+++ b/templates/bootstrap/bootstrap-panel.vars.php
@@ -65,6 +65,11 @@ function bootstrap_preprocess_bootstrap_panel(&$variables) {
     $variables['target'] = '#' . $element['#id'] . ' > .collapse';
   }
 
+  // Check for errors and set error class.
+  if (!empty($element['#errors']) && empty($element['#error_no_message']) || bootstrap_setting('forms_required_has_error') && $element['#required']) {
+    $variables['errors'] = !empty($element['#errors']) ? $element['#errors'] : t('Required field.');
+  }
+
   // Iterate over optional variables.
   $keys = array(
     'description',