diff --git a/src/ol/control/control.js b/src/ol/control/control.js
index a640b2beca..ad7ab15f7e 100644
--- a/src/ol/control/control.js
+++ b/src/ol/control/control.js
@@ -49,6 +49,15 @@ ol.control.Control = function(controlOptions) {
 goog.inherits(ol.control.Control, goog.Disposable);
 
 
+/**
+ * @inheritDoc
+ */
+ol.control.Control.prototype.disposeInternal = function() {
+  goog.dom.removeNode(this.element);
+  goog.base(this, 'disposeInternal');
+};
+
+
 /**
  * @return {ol.Map} Map.
  */
diff --git a/src/ol/map.js b/src/ol/map.js
index fe147e1541..9ed3f64a5f 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -290,6 +290,16 @@ ol.Map.prototype.canRotate = function() {
 };
 
 
+/**
+ *
+ * @inheritDoc
+ */
+ol.Map.prototype.disposeInternal = function() {
+  goog.dom.removeNode(this.viewport_);
+  goog.base(this, 'disposeInternal');
+};
+
+
 /**
  * @param {ol.Extent} extent Extent.
  */
diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js
index b5b8d49481..63b3c956cd 100644
--- a/src/ol/mapbrowserevent.js
+++ b/src/ol/mapbrowserevent.js
@@ -285,9 +285,11 @@ ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
       this.handleUp_, false, this);
   goog.events.unlisten(element,
       goog.events.EventType.CLICK, this.click_, false, this);
-  goog.asserts.assert(goog.isDef(this.dragListenerKeys_));
-  goog.array.forEach(this.dragListenerKeys_, goog.events.unlistenByKey);
-  this.dragListenerKeys_ = null;
+  if (!goog.isNull(this.dragListenerKeys_)) {
+    goog.array.forEach(this.dragListenerKeys_, goog.events.unlistenByKey);
+    this.dragListenerKeys_ = null;
+  }
+  goog.base(this, 'disposeInternal');
 };
 
 
diff --git a/test/ol.html b/test/ol.html
index d504a2059c..1d438b53cd 100644
--- a/test/ol.html
+++ b/test/ol.html
@@ -83,6 +83,7 @@
   <script type="text/javascript" src="spec/ol/tilegrid.test.js"></script>
   <script type="text/javascript" src="spec/ol/tilerange.test.js"></script>
   <script type="text/javascript" src="spec/ol/tileurlfunction.test.js"></script>
+  <script type="text/javascript" src="spec/ol/control/control.test.js"></script>
 
   <script type="text/javascript">
 
@@ -124,5 +125,6 @@
 </head>
 
 <body>
+  <div id="map"></div>
 </body>
 </html>
diff --git a/test/spec/ol/control/control.test.js b/test/spec/ol/control/control.test.js
new file mode 100644
index 0000000000..f1245ae66a
--- /dev/null
+++ b/test/spec/ol/control/control.test.js
@@ -0,0 +1,27 @@
+goog.require('goog.dom');
+goog.require('ol.Map');
+goog.require('ol.control.Control');
+
+describe('ol.control.Control', function() {
+  var map, control;
+
+  beforeEach(function() {
+    map = new ol.Map({
+      target: document.getElementById('map')
+    });
+    var element = goog.dom.createDom(goog.dom.TagName.DIV);
+    control = new ol.control.Control({element: element});
+    control.setMap(map);
+  });
+
+  afterEach(function() {
+    map.dispose();
+  });
+
+  describe('dispose', function() {
+    it('removes the control element from its parent', function() {
+      control.dispose();
+      expect(goog.dom.getParentElement(control.element)).toBeNull();
+    });
+  });
+});
diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js
index 80fe996677..a936388a7d 100644
--- a/test/spec/ol/map.test.js
+++ b/test/spec/ol/map.test.js
@@ -1,7 +1,23 @@
+goog.require('goog.dom');
 goog.require('ol.Map');
 
 describe('ol.Map', function() {
 
+  describe('dispose', function() {
+    var map;
+
+    beforeEach(function() {
+      map = new ol.Map({
+        target: document.getElementById('map')
+      });
+    });
+
+    it('removes the viewport from its parent', function() {
+      map.dispose();
+      expect(goog.dom.getParentElement(map.getViewport())).toBeNull();
+    });
+  });
+
   describe('create constraints', function() {
 
     describe('create resolution constraint', function() {
