diff --git a/lib/bootstrap_forms/helpers/wrappers.rb b/lib/bootstrap_forms/helpers/wrappers.rb
index 53e0ca2..4e14a0d 100644
--- a/lib/bootstrap_forms/helpers/wrappers.rb
+++ b/lib/bootstrap_forms/helpers/wrappers.rb
@@ -5,6 +5,13 @@ module Helpers
     module Wrappers
       private
       def control_group_div(&block)
+        field_errors = error_string
+        if @field_options[:error]
+          (@field_options[:error] << ', ' << field_errors) if field_errors
+        else
+          @field_options[:error] = field_errors
+        end
+
         klasses = ['control-group']
         klasses << 'error'   if @field_options[:error]
         klasses << 'info'    if @field_options[:info]