diff --git a/addon/components/errors-for.hbs b/addon/components/errors-for.hbs
index 5f8aa4c0..ce7606a4 100644
--- a/addon/components/errors-for.hbs
+++ b/addon/components/errors-for.hbs
@@ -5,7 +5,7 @@
         {{component @customErrorComponent error=error}}
       {{else}}
         <label class="error" data-test-form-error>
-          {{error}}
+          {{error.message}}
         </label>
       {{/if}}
     {{/each}}
diff --git a/addon/components/field-for.hbs b/addon/components/field-for.hbs
index 7bd14334..4f91216a 100644
--- a/addon/components/field-for.hbs
+++ b/addon/components/field-for.hbs
@@ -99,13 +99,13 @@
               @visible={{this._showConfirm}}
               @buttonClass={{this.buttonClasses}}
               @isActing={{this.form.isSubmitting}}
-              @customCommitCancelComponent={{this.customCommitCancelComponent}}
+              @customCommitCancelComponent={{this.formFor.customCommitCancelComponent}}
               @commit={{this.commit}}
               @cancel={{this.cancel}}
             />
           </div>
 
-          <ErrorsFor @errors={{this.errors}} @customErrorComponent={{this.customErrorComponent}} />
+          <ErrorsFor @errors={{this.errors}} @customErrorComponent={{this.formFor.customErrorComponent}} />
         </div>
       </AttachPopover>
     {{else}}
@@ -154,13 +154,13 @@
               @visible={{this._showConfirm}}
               @buttonClass={{this.buttonClasses}}
               @isActing={{this.form.isSubmitting}}
-              @customCommitCancelComponent={{this.customCommitCancelComponent}}
+              @customCommitCancelComponent={{this.formFor.customCommitCancelComponent}}
               @commit={{this.commit}}
               @cancel={{this.cancel}}
             />
           </div>
 
-          <ErrorsFor @errors={{this.errors}} @customErrorComponent={{this.customErrorComponent}} />
+          <ErrorsFor @errors={{this.errors}} @customErrorComponent={{this.formFor.customErrorComponent}} />
         </div>
       {{/if}}
     {{/if}}
diff --git a/addon/components/form-for.hbs b/addon/components/form-for.hbs
index 1dcb5982..696652d8 100644
--- a/addon/components/form-for.hbs
+++ b/addon/components/form-for.hbs
@@ -73,7 +73,7 @@
           onClick=(fn this.confirmDestroy this.model)
         )
         errors=(component
-          "errors-for" errors=this.errors customErrorComponent=this.customErrorComponent
+          "errors-for" errors=this.errors customErrorComponent=this.formFor.customErrorComponent
         )
         self=this
       )
diff --git a/tests/dummy/app/controllers/docs/usage.js b/tests/dummy/app/controllers/docs/usage.js
index 9ad3591f..53ba89ee 100644
--- a/tests/dummy/app/controllers/docs/usage.js
+++ b/tests/dummy/app/controllers/docs/usage.js
@@ -38,25 +38,25 @@ export default class UsageController extends Controller {
   toggleErrors() {
     if (this.errors) {
       this.anObject.errors = {
-        string: ['String Error'],
-        password: ['Password Error'],
-        text: ['Text Error'],
-        email: ['Email Error'],
-        url: ['URL Error'],
-        tel: ['TEL Error'],
-        search: ['Search Error'],
-        number: ['Number Error'],
-        currency: ['Currency Error'],
-        numberRange: ['Number Range Error'],
-        color: ['Color Error'],
-        date: ['Date Error'],
-        time: ['Time Error'],
-        datetime: ['Datetime Error'],
-        boolean: ['Boolean Error'],
-        select: ['Select Error'],
-        radio: ['Select Error'],
-        start: ['Start Error'],
-        end: ['End Error'],
+        string: [{message:'String Error'}],
+        password: [{message:'Password Error'}],
+        text: [{message:'Text Error'}],
+        email: [{message:'Email Error'}],
+        url: [{message:'URL Error'}],
+        tel: [{message:'TEL Error'}],
+        search: [{message:'Search Error'}],
+        number: [{message:'Number Error'}],
+        currency: [{message:'Currency Error'}],
+        numberRange: [{message:'Number Range Error'}],
+        color: [{message:'Color Error'}],
+        date: [{message:'Date Error'}],
+        time: [{message:'Time Error'}],
+        datetime: [{message:'Datetime Error'}],
+        boolean: [{message:'Boolean Error'}],
+        select: [{message:'Select Error'}],
+        radio: [{message:'Select Error'}],
+        start: [{message:'Start Error'}],
+        end: [{message:'End Error'}],
       };
     } else {
       this.anObject.errors = {