diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 266a13f..0ebddef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,13 +6,13 @@ Thanks for wanting to contribute. Please follow the instructions below.
 1. Clone the repository
 2. Run `bower install` in the repository directory
 3. Run `npm install` in the repository directory
-4. Run `grunt serve` to start servering the demo on `http://localhost:9001/demo/`
+4. Run `grunt serve` to start serving the demo on `http://localhost:9001/demo/`
 
 
 
 ## Before creating a pull request
 1. Make sure you add tests to `/test/angular-validator-spec.js` that test your changes. To run tests `grunt test`
-2. If approriate update the readme to reflect your changes.
+2. If appropriate update the README to reflect your changes.
 3. Run `grunt build` to minify and create a `dist` version of your changes
-4. If approriate update the demo in /demo/
+4. If appropriate update the demo in /demo/
 5. The project maintainer will update the Plunker demo that is linked in README.md if needed.
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 9f4cbc4..ddabbd4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,3 +1,8 @@
+/*jslint node: true */
+'use strict';
+
+var pkg = require('./package.json');
+
 module.exports = function(grunt) {
 
     // Grunt Config
@@ -21,6 +26,12 @@ module.exports = function(grunt) {
                 "dest": "dist/angular-validator.js"
             }
         },
+        ngAnnotate: {
+            main: {
+                src: 'dist/angular-validator.js',
+                dest: 'dist/angular-validator.js'
+            },
+        },
         uglify: {
             dist: {
                 src: "dist/angular-validator.js",
@@ -66,6 +77,8 @@ module.exports = function(grunt) {
 
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-contrib-connect');
+    grunt.loadNpmTasks('grunt-ng-annotate');
+
 
     // Load the plugin that provides the "jshint" task.
     grunt.loadNpmTasks('grunt-contrib-jshint');
@@ -81,8 +94,8 @@ module.exports = function(grunt) {
 
     // Register Task
     grunt.registerTask('serve', ['connect', 'watch']);
-    grunt.registerTask('build', ['concat', 'uglify', 'karma:build',]);
-    grunt.registerTask('test', ['karma:build',]);
+    grunt.registerTask('build', ['concat', 'ngAnnotate', 'uglify', 'karma:build']);
+    grunt.registerTask('test', ['karma:build', ]);
     grunt.registerTask('test-debug', ['karma:debug']);
     grunt.registerTask('travis', ['karma:travis']);
 };
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 35cf191..3590461 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tg-angular-validator",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "authors": [
     "Zohar Jackson <zohar@turinggroup.com>"
   ],
@@ -32,7 +32,8 @@
   "dependencies": {
     "angular": ">=1.3.0",
     "bootstrap": ">=3.2.0",
-    "font-awesome": ">=4.0.3"
+    "font-awesome": ">=4.0.3",
+    "angular-mocks": "~1.4.1"
   },
   "homepage": "https://github.com/turinggroup/angular-validator"
 }
diff --git a/dist/angular-validator.js b/dist/angular-validator.js
index a4e8b63..a5ab597 100644
--- a/dist/angular-validator.js
+++ b/dist/angular-validator.js
@@ -173,7 +173,7 @@ angular.module('angularValidator').directive('angularValidator',
 
 
                     // Only add validation messages if the form field is $dirty or the form has been submitted
-                    if (scopeElementModel.$dirty || scope[element.form.name].submitted) {
+                    if (scopeElementModel.$dirty || (scope[element.form.name] && scope[element.form.name].submitted)) {
 
                         if (scopeElementModel.$error.required) {
                             // If there is a custom required message display it
@@ -232,7 +232,7 @@ angular.module('angularValidator').directive('angularValidator',
 
 
                     // Only add/remove validation classes if the field is $dirty or the form has been submitted
-                    if (formField.$dirty || scope[element.form.name].submitted) {
+                    if (formField.$dirty || (scope[element.form.name] && scope[element.form.name].submitted)) {
                       if (formField.$invalid) {
                             angular.element(element.parentNode).addClass('has-error');
 
diff --git a/dist/angular-validator.min.js b/dist/angular-validator.min.js
index 18904f2..ef95326 100644
--- a/dist/angular-validator.min.js
+++ b/dist/angular-validator.min.js
@@ -1 +1 @@
-angular.module("angularValidator",[]),angular.module("angularValidator").directive("angularValidator",function(){return{restrict:"A",link:function(a,b,c,d){function e(a){for(var b=0;b<a.length;b++)b in a&&f(a[b])}function f(b){b.isWatchedByValidator||(b.isWatchedByValidator=!0,"validate-on"in b.attributes&&"blur"===b.attributes["validate-on"].value&&angular.element(b).on("blur",function(){j(b),m(b)}),a.$watch(function(){return b.value+b.required+p.submitted+i(b)+g(p[b.name])+h(p[b.name])},function(){if(p.submitted)j(b),m(b);else{var a="validate-on"in b.attributes&&"dirty"===b.attributes["validate-on"].value;a?(j(b),m(b)):p[b.name]&&p[b.name].$pristine&&(j(b),m(b))}}))}function g(a){return a&&"$dirty"in a?a.$dirty:void 0}function h(a){return a&&"$valid"in a?a.$valid:void 0}function i(b){if("validator"in b.attributes){var c=a.$eval(b.attributes.validator.value);return p[b.name].$setValidity("angularValidator",c),c}}function j(b){var c=function(){return"<i class='fa fa-times'></i> Required"},d=function(){return"<i class='fa fa-times'></i> Invalid"};if(b.name in p){var e=p[b.name],f=l(b);f&&f.remove(),(e.$dirty||a[b.form.name].submitted)&&(e.$error.required?"required-message"in b.attributes?angular.element(b).after(k(b.attributes["required-message"].value)):angular.element(b).after(k(c)):e.$valid||("invalid-message"in b.attributes?angular.element(b).after(k(b.attributes["invalid-message"].value)):angular.element(b).after(k(d))))}}function k(b){return"<label class='control-label has-error validationMessage'>"+a.$eval(b)+"</label>"}function l(a){for(var b=angular.element(a).parent().children(),c=0;c<b.length;c++)if(angular.element(b[c]).hasClass("validationMessage"))return angular.element(b[c]);return!1}function m(b){if(b.name in p){var c=p[b.name];angular.element(b).removeClass("has-error"),angular.element(b.parentNode).removeClass("has-error"),(c.$dirty||a[b.form.name].submitted)&&c.$invalid&&(angular.element(b.parentNode).addClass("has-error"),angular.element(b).addClass("has-error"))}}var n=angular.element(b)[0],o=n.attributes.name.value,p=a[o];p.submitted=!1,a.$watch(function(){return n.length},function(){e(n)}),b.on("submit",function(b){b.preventDefault(),a.$apply(function(){p.submitted=!0}),p.$valid&&a.$apply(function(){a.$eval(n.attributes["angular-validator-submit"].value)})}),p.reset=function(){for(var a=0;a<n.length;a++)n[a].name&&(p[n[a].name].$setViewValue(""),p[n[a].name].$render());p.submitted=!1,p.$setPristine()},e(n)}}});
\ No newline at end of file
+angular.module("angularValidator",[]),angular.module("angularValidator").directive("angularValidator",function(){return{restrict:"A",link:function(a,b){function c(a){for(var b=0;b<a.length;b++)b in a&&d(a[b])}function d(b){b.isWatchedByValidator||(b.isWatchedByValidator=!0,"validate-on"in b.attributes&&"blur"===b.attributes["validate-on"].value&&angular.element(b).on("blur",function(){h(b),k(b)}),a.$watch(function(){return b.value+b.required+n.submitted+g(b)+e(n[b.name])+f(n[b.name])},function(){if(n.submitted)h(b),k(b);else{var a="validate-on"in b.attributes&&"dirty"===b.attributes["validate-on"].value;a?(h(b),k(b)):n[b.name]&&n[b.name].$pristine&&(h(b),k(b))}}))}function e(a){return a&&"$dirty"in a?a.$dirty:void 0}function f(a){return a&&"$valid"in a?a.$valid:void 0}function g(b){if("validator"in b.attributes){var c=a.$eval(b.attributes.validator.value);return n[b.name].$setValidity("angularValidator",c),c}}function h(b){var c=function(){return"<i class='fa fa-times'></i> Required"},d=function(){return"<i class='fa fa-times'></i> Invalid"};if(b.name in n){var e=n[b.name],f=j(b);f&&f.remove(),(e.$dirty||a[b.form.name]&&a[b.form.name].submitted)&&(e.$error.required?angular.element(b).after("required-message"in b.attributes?i(b.attributes["required-message"].value):i(c)):e.$valid||angular.element(b).after("invalid-message"in b.attributes?i(b.attributes["invalid-message"].value):i(d)))}}function i(b){return"<label class='control-label has-error validationMessage'>"+a.$eval(b)+"</label>"}function j(a){for(var b=angular.element(a).parent().children(),c=0;c<b.length;c++)if(angular.element(b[c]).hasClass("validationMessage"))return angular.element(b[c]);return!1}function k(b){if(b.name in n){var c=n[b.name];angular.element(b).removeClass("has-error"),angular.element(b.parentNode).removeClass("has-error"),(c.$dirty||a[b.form.name]&&a[b.form.name].submitted)&&c.$invalid&&(angular.element(b.parentNode).addClass("has-error"),angular.element(b).addClass("has-error"))}}var l=angular.element(b)[0],m=l.attributes.name.value,n=a[m];n.submitted=!1,a.$watch(function(){return l.length},function(){c(l)}),b.on("submit",function(b){b.preventDefault(),a.$apply(function(){n.submitted=!0}),n.$valid&&a.$apply(function(){a.$eval(l.attributes["angular-validator-submit"].value)})}),n.reset=function(){for(var a=0;a<l.length;a++)l[a].name&&(n[l[a].name].$setViewValue(""),n[l[a].name].$render());n.submitted=!1,n.$setPristine()},c(l)}}});
\ No newline at end of file
diff --git a/karma.conf.js b/karma.conf.js
index 7ae743a..7db3aad 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -10,8 +10,8 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.6/angular.js',
-      'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.6/angular-mocks.js',
+      'bower_components/angular/angular.js',
+      'bower_components/angular-mocks/angular-mocks.js',
       'dist/angular-validator.min.js',
       'test/*.js'
     ],
diff --git a/package.json b/package.json
index 18d9a10..42847df 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,8 @@
     "karma-jasmine": "~0.1.5",
     "karma-chrome-launcher": "~0.1.2",
     "karma-phantomjs-launcher": "~0.1.2",
-    "karma-firefox-launcher": "~0.1.3"
+    "karma-firefox-launcher": "~0.1.3",
+    "ng-annotate": "0.15.4",
+    "grunt-ng-annotate": "~0.10.0"
   }
 }
\ No newline at end of file
diff --git a/src/angular-validator.js b/src/angular-validator.js
index a4e8b63..a5ab597 100644
--- a/src/angular-validator.js
+++ b/src/angular-validator.js
@@ -173,7 +173,7 @@ angular.module('angularValidator').directive('angularValidator',
 
 
                     // Only add validation messages if the form field is $dirty or the form has been submitted
-                    if (scopeElementModel.$dirty || scope[element.form.name].submitted) {
+                    if (scopeElementModel.$dirty || (scope[element.form.name] && scope[element.form.name].submitted)) {
 
                         if (scopeElementModel.$error.required) {
                             // If there is a custom required message display it
@@ -232,7 +232,7 @@ angular.module('angularValidator').directive('angularValidator',
 
 
                     // Only add/remove validation classes if the field is $dirty or the form has been submitted
-                    if (formField.$dirty || scope[element.form.name].submitted) {
+                    if (formField.$dirty || (scope[element.form.name] && scope[element.form.name].submitted)) {
                       if (formField.$invalid) {
                             angular.element(element.parentNode).addClass('has-error');