diff --git a/.gitignore b/.gitignore
index 5148e52..dc3c07f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,8 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+
+# Compiled templates
+lib/dotjs/*.js
+
+.DS_Store
diff --git a/lib/dot/errorMessage.jst b/lib/dot/errorMessage.jst
index a6e69ff..7302201 100644
--- a/lib/dot/errorMessage.jst
+++ b/lib/dot/errorMessage.jst
@@ -10,17 +10,25 @@
         , $i = 'errorMessage_i' + $lvl
         , $err = 'errorMessage_err' + $lvl
         , $errors = 'errorMessage_errors' + $lvl
+        , $nextChar = 'errorMessage_nextChar' + $lvl
         , $errSchemaPathString = it.util.toQuotedString(it.errSchemaPath);
     }}
     var {{=$dataPath}} = (dataPath || '') + {{= it.errorPath }};
     {{? typeof $schema == 'string' }}
       var {{=$i}} = 0;
-      var {{=$err}};
+      var {{=$err}}, {{=$nextChar}};
       var {{=$errors}} = undefined;
       while ({{=$i}}<errors) {
         {{=$err}} = vErrors[{{=$i}}];
         if ({{=$err}}.keyword != '{{=$keyword}}'
-            && {{=$err}}.dataPath == {{=$dataPath}}
+            && ({{=$err}}.dataPath == {{=$dataPath}} ||
+              ({{=$err}}.dataPath.indexOf({{=$dataPath}}) == 0 &&
+               {{? it.opts.jsonPointers }}
+                 {{=$err}}.dataPath[{{=$dataPath}}.length] == '/'
+               {{??}}
+                 ({{=$nextChar}} = {{=$err}}.dataPath[{{=$dataPath}}.length]) == '.'
+                  || {{=$nextChar}} == '['
+               {{?}}))
             && {{=$err}}.schemaPath.indexOf({{=$errSchemaPathString}}) == 0
             && {{=$err}}.schemaPath[{{=it.errSchemaPath.length}}] == '/') {
           if ({{=$errors}}) {{=$errors}}.push({{=$err}});
diff --git a/lib/dotjs/README.md b/lib/dotjs/README.md
new file mode 100644
index 0000000..e2846c8
--- /dev/null
+++ b/lib/dotjs/README.md
@@ -0,0 +1,3 @@
+These files are compiled dot templates from dot folder.
+
+Do NOT edit them directly, edit the templates and run `npm run build` from main ajv-keywords folder.
diff --git a/lib/dotjs/errorMessage.js b/lib/dotjs/errorMessage.js
deleted file mode 100644
index be8fcd2..0000000
--- a/lib/dotjs/errorMessage.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-module.exports = function generate_errorMessage(it, $keyword, $ruleType) {
-  var out = ' ';
-  var $lvl = it.level;
-  var $dataLvl = it.dataLevel;
-  var $schema = it.schema[$keyword];
-  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
-  var $data = 'data' + ($dataLvl || '');
-  if (it.createErrors !== false) {
-    out += ' if (errors > 0) { ';
-    var $rule = this,
-      $dataPath = 'errorMessage_dataPath' + $lvl,
-      $i = 'errorMessage_i' + $lvl,
-      $err = 'errorMessage_err' + $lvl,
-      $errors = 'errorMessage_errors' + $lvl,
-      $errSchemaPathString = it.util.toQuotedString(it.errSchemaPath);
-    out += ' var ' + ($dataPath) + ' = (dataPath || \'\') + ' + (it.errorPath) + '; ';
-    if (typeof $schema == 'string') {
-      out += ' var ' + ($i) + ' = 0; var ' + ($err) + '; var ' + ($errors) + ' = undefined; while (' + ($i) + '<errors) { ' + ($err) + ' = vErrors[' + ($i) + ']; if (' + ($err) + '.keyword != \'' + ($keyword) + '\' && ' + ($err) + '.dataPath == ' + ($dataPath) + ' && ' + ($err) + '.schemaPath.indexOf(' + ($errSchemaPathString) + ') == 0 && ' + ($err) + '.schemaPath[' + (it.errSchemaPath.length) + '] == \'/\') { if (' + ($errors) + ') ' + ($errors) + '.push(' + ($err) + '); else ' + ($errors) + ' = [' + ($err) + ']; vErrors.splice(' + ($i) + ', 1); errors--; } else { ' + ($i) + '++; } } if (' + ($errors) + ') { var err =     { keyword: \'' + ($keyword) + '\' , dataPath: ' + ($dataPath) + ' , schemaPath: ' + ($errSchemaPathString) + ' , params: { errors: ' + ($errors) + ' } ';
-      if (it.opts.messages !== false) {
-        out += ' , message: ' + (it.util.toQuotedString($schema)) + ' ';
-      }
-      if (it.opts.verbose) {
-        out += ' , schema: ' + (it.util.toQuotedString($schema)) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
-      }
-      out += ' };  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; } ';
-    }
-    out += ' }';
-  }
-  return out;
-}
diff --git a/package.json b/package.json
index ebd5f2b..a6d9f3c 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "eslint": "eslint *.js spec",
     "test-spec": "mocha spec/*.spec.js -R spec",
     "test-cov": "nyc npm run test-spec",
-    "test": "npm run eslint && npm run test-cov"
+    "test": "npm run eslint && npm run build && npm run test-cov"
   },
   "repository": {
     "type": "git",
diff --git a/spec/string.spec.js b/spec/string.spec.js
index 181e4b9..bc056a7 100644
--- a/spec/string.spec.js
+++ b/spec/string.spec.js
@@ -14,7 +14,7 @@ describe('errorMessage value is a string', function() {
       type: 'object',
       required: ['foo'],
       properties: {
-        foo: true/*{ type: 'integer' }*/
+        foo: { type: 'integer' }
       },
       additionalProperties: false,
       errorMessage: 'should be an object with an integer property foo only'
@@ -25,8 +25,8 @@ describe('errorMessage value is a string', function() {
     testInvalid({}, ['required']);
     testInvalid({bar: 2}, ['required', 'additionalProperties']);
     testInvalid({foo: 1, bar: 2}, ['additionalProperties']);
-    // testInvalid({foo: 'a'}, ['type']);
-    // testInvalid({foo: 'a', bar: 2}, ['type', 'additionalProperties']);
+    testInvalid({foo: 'a'}, ['type']);
+    testInvalid({foo: 'a', bar: 2}, ['type', 'additionalProperties']);
     testInvalid(1, ['type']);
 
     function testInvalid(data, expectedReplacedKeywords) {