diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js
index 6f04a645bd..dae21ee400 100644
--- a/lib/OpenLayers/Control.js
+++ b/lib/OpenLayers/Control.js
@@ -130,8 +130,12 @@ OpenLayers.Control = OpenLayers.Class({
         // eliminate circular references
         if (this.handler) {
             this.handler.destroy();
-        }    
-        this.map = null;
+            this.handler = null;
+        }
+        if (this.map) {
+            this.map.removeControl(this);
+            this.map = null;
+        }
     },
 
     /** 
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index ac455ac470..a06e4948fa 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -797,8 +797,8 @@ OpenLayers.Map = OpenLayers.Class({
     removeControl: function (control) {
         //make sure control is non-null and actually part of our map
         if ( (control) && (control == this.getControl(control.id)) ) {
-            if (!control.outsideViewport) {
-                this.viewPortDiv.removeChild(control.div)
+            if (!control.outsideViewport && control.div) {
+                this.viewPortDiv.removeChild(control.div);
             }
             OpenLayers.Util.removeItem(this.controls, control);
         }
diff --git a/tests/test_Control.html b/tests/test_Control.html
index 9757e1d0db..47095948b1 100644
--- a/tests/test_Control.html
+++ b/tests/test_Control.html
@@ -2,12 +2,38 @@
 <head>
   <script src="../lib/OpenLayers.js"></script>
   <script type="text/javascript">
-    var map; 
-    function test_01_Control_constructor (t) {
-        t.plan( 1 );
+    function test_Control_constructor(t) {
+        t.plan(2);
     
-        control = new OpenLayers.Control();
-        t.ok( control instanceof OpenLayers.Control, "new OpenLayers.Control returns object" );
+        var control = new OpenLayers.Control();
+
+        t.ok(control instanceof OpenLayers.Control, "new OpenLayers.Control returns object");
+        t.eq(control.displayClass, "olControl", "displayClass set correctly");
+    }
+
+    function test_Control_addControl(t) {
+        t.plan(2);
+    
+        var map = new OpenLayers.Map('map');
+        var control = new OpenLayers.Control();
+        map.addControl(control);
+
+        t.ok(control.map === map, "Control.map is set to the map object" );
+        t.ok(map.controls[map.controls.length - 1] === control, "map.controls contains control");
+    }
+
+    function test_Control_destroy(t) {
+        t.plan(3);
+    
+        var map = new OpenLayers.Map('map');
+        var control = new OpenLayers.Control();
+        map.addControl(control);
+
+        control.destroy();
+        t.ok(map.controls[map.controls.length - 1] != control, "map.controls doesn't contains control");
+
+        t.ok(control.map == null, "Control.map is null");
+        t.ok(control.handler == null, "Control.handler is null");
     }
 
   </script>
