diff --git a/docs/components/angular-bootstrap/bootstrap-prettify.js b/docs/components/angular-bootstrap/bootstrap-prettify.js
index b42c7c3a7b2c..9d8a7d23482e 100644
--- a/docs/components/angular-bootstrap/bootstrap-prettify.js
+++ b/docs/components/angular-bootstrap/bootstrap-prettify.js
@@ -241,6 +241,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
         embedRootScope.$destroy();
       });
 
+      element.data('$injector', null);
       angular.bootstrap(element, modules);
     }
   };
diff --git a/src/jqLite.js b/src/jqLite.js
index 6ac9998792a0..4a52cba018f8 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -330,7 +330,7 @@ function JQLiteInheritedData(element, name, value) {
   }
 
   while (element.length) {
-    if (value = element.data(name)) return value;
+    if ((value = element.data(name)) !== undefined) return value;
     element = element.parent();
   }
 }
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js
index abfad064632a..913e61924726 100644
--- a/test/jqLiteSpec.js
+++ b/test/jqLiteSpec.js
@@ -126,6 +126,20 @@ describe('jqLite', function() {
         dealoc(doc);
       }
     );
+
+    it('should return null values', function () {
+      var ul = jqLite('<ul><li><p><b>deep deep</b><p></li></ul>'),
+          li = ul.find('li'),
+          b = li.find('b');
+
+      ul.data('foo', 'bar');
+      li.data('foo', null);
+      expect(b.inheritedData('foo')).toBe(null);
+      expect(li.inheritedData('foo')).toBe(null);
+      expect(ul.inheritedData('foo')).toBe('bar');
+
+      dealoc(ul);
+    });
   });
 
 
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index 7b4fe0ec1abf..514a5fdbbdbd 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -56,7 +56,7 @@ afterEach(function() {
   forEachSorted(cache, function(expando, key){
     angular.forEach(expando.data, function(value, key){
       count ++;
-      if (value.$element) {
+      if (value && value.$element) {
         dump('LEAK', key, value.$id, sortedHtml(value.$element));
       } else {
         dump('LEAK', key, angular.toJson(value));