diff --git a/angular.ng-modules.js b/angular.ng-modules.js
deleted file mode 100644
index 169ba15..0000000
--- a/angular.ng-modules.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// By Luis Perez 
-// From blog post: http://www.simplygoodcode.com/2014/04/angularjs-getting-around-ngapp-limitations-with-ngmodule/
-
-(function() {
-  function initNgModules(element) {
-      var elements = [element],
-          moduleElements = [],
-          modules = [],
-          names = ['ng:module', 'ng-module', 'x-ng-module', 'data-ng-module', 'ng:modules', 'ng-modules', 'x-ng-modules', 'data-ng-modules'],
-          NG_MODULE_CLASS_REGEXP = /\sng[:\-]module[s](:\s*([\w\d_]+);?)?\s/;
-
-      function append(element) {
-          element && elements.push(element);
-      }
-
-      for(var i = 0; i < names.length; i++) {
-          var name = names[i];
-          append(document.getElementById(name));
-          name = name.replace(':', '\\:');
-          if (element.querySelectorAll) {
-              var elements2;
-              elements2 = element.querySelectorAll('.' + name);
-              for(var j = 0; j < elements2.length; j++) append(elements2[j]);
-              
-              elements2 = element.querySelectorAll('.' + name + '\\:');
-              for(var j = 0; j < elements2.length; j++) append(elements2[j]);
-              
-              elements2 = element.querySelectorAll('[' + name + ']');
-              for(var j = 0; j < elements2.length; j++) append(elements2[j]);
-          }
-      }
-
-      for(var i = 0; i < elements.length; i++) {
-          var element = elements[i];
-
-          var className = ' ' + element.className + ' ';
-          var match = NG_MODULE_CLASS_REGEXP.exec(className);
-          if (match) {
-              moduleElements.push(element);
-              modules.push((match[2] || '').replace(/\s+/g, ','));
-          } else {
-              if(element.attributes) {
-                  for(var j = 0; j < element.attributes.length; j++) {
-                      var attr = element.attributes[j];
-                      
-                      if (names.indexOf(attr.name) != -1) {
-                          moduleElements.push(element);
-                          modules.push(attr.value);
-                      }
-                  }
-              }
-          }
-      }
-      
-      for(var i = 0; i < moduleElements.length; i++) {
-          var moduleElement = moduleElements[i];
-          var module = modules[i].replace(/ /g,'').split(",");
-          angular.bootstrap(moduleElement, module);
-      }
-  }
-
-  angular.element(document).ready(function() {
-        initNgModules(document);
-  });
-})();
\ No newline at end of file
diff --git a/ng-modules-safe.js b/ng-modules-safe.js
new file mode 100644
index 0000000..986dd8a
--- /dev/null
+++ b/ng-modules-safe.js
@@ -0,0 +1,76 @@
+// By Luis Perez
+// From blog post: http://www.simplygoodcode.com/2014/04/angularjs-getting-around-ngapp-limitations-with-ngmodule/
+
+(function() {
+  function initNgModules(element) {
+    var elements = [element],
+      moduleElements = [],
+      modules = [],
+      names = ['ng-module', 'data-ng-module', 'ng-modules', 'data-ng-modules'],
+      NG_MODULE_CLASS_REGEXP = /\sng[:\-]module[s](:\s*([\w\d_]+);?)?\s/;
+
+    function append(element) {
+      element && elements.push(element);
+    }
+
+    for (var i = 0; i < names.length; i++) {
+      var name = names[i];
+      append(document.getElementById(name));
+      name = name.replace(':', '\\:');
+      if (element.querySelectorAll) {
+        var elements2;
+        elements2 = element.querySelectorAll('.' + name);
+        for (var j = 0; j < elements2.length; j++) append(elements2[j]);
+
+        elements2 = element.querySelectorAll('.' + name + '\\:');
+        for (var j = 0; j < elements2.length; j++) append(elements2[j]);
+
+        elements2 = element.querySelectorAll('[' + name + ']');
+        for (var j = 0; j < elements2.length; j++) append(elements2[j]);
+      }
+    }
+
+    for (var i = 0; i < elements.length; i++) {
+      var element = elements[i];
+
+      var className = ' ' + element.className + ' ';
+      var match = NG_MODULE_CLASS_REGEXP.exec(className);
+      if (match) {
+        moduleElements.push(element);
+        modules.push((match[2] || '').replace(/\s+/g, ','));
+      } else {
+        if (element.attributes) {
+          for (var j = 0; j < element.attributes.length; j++) {
+            var attr = element.attributes[j];
+
+            if (names.indexOf(attr.name) != -1) {
+              moduleElements.push(element);
+              modules.push(attr.value);
+            }
+          }
+        }
+      }
+    }
+
+    for (var i = 0; i < moduleElements.length; i++) {
+      var moduleElement = moduleElements[i];
+      if (typeof(modules[i]) != 'undefined') {
+        var moduleList = modules[i].replace(/ /g, '').split(",");
+        var initializedModuleList = [];
+        for (var j = 0; j < moduleList.length; ++j) {
+          try {
+            angular.module(moduleList[j]);
+            initializedModuleList.push(moduleList[j]);
+          } catch (e) {
+            console.error(e);
+          }
+        }
+        angular.bootstrap(moduleElement, initializedModuleList);
+      }
+    }
+  }
+
+  angular.element(document).ready(function() {
+    initNgModules(document);
+  });
+})();