diff --git a/addon/errors.js b/addon/errors.js
index f5ee250d..a1f73426 100644
--- a/addon/errors.js
+++ b/addon/errors.js
@@ -4,12 +4,13 @@ const {
   A: emberArray,
   Object: EmberObject,
   get,
-  set
+  set,
+  run
 } = Ember;
 
 export default EmberObject.extend({
   unknownProperty(property) {
-    set(this, property, emberArray());
-    return get(this, property);
+    run.once(() => { set(this, property, emberArray()); });
+    return emberArray();
   }
 });
diff --git a/addon/mixin.js b/addon/mixin.js
index 2fa174f2..f1ed7402 100644
--- a/addon/mixin.js
+++ b/addon/mixin.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import Errors from 'ember-validations/errors';
 import Base from 'ember-validations/validators/base';
-import getOwner from 'ember-getowner-polyfill';
 
 const {
   A: emberArray,
@@ -42,7 +41,7 @@ const pushValidatableObject = function(model, property) {
 };
 
 const lookupValidator = function(validatorName) {
-  let owner = getOwner(this);
+  let owner = Ember.getOwner(this);
   let service = owner.lookup('service:validations');
   let validators = [];
   let cache;