diff --git a/src/ol/map.js b/src/ol/map.js
index 4cb0aae1b8..24b83e402f 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -446,10 +446,13 @@ ol.Map.prototype.redrawInternal = function() {
  */
 ol.Map.prototype.removeLayerRenderer = function(layer) {
   var key = goog.getUid(layer);
-  goog.asserts.assert(key in this.layerRenderers);
-  var layerRenderer = this.layerRenderers[key];
-  delete this.layerRenderers[key];
-  return layerRenderer;
+  if (key in this.layerRenderers) {
+    var layerRenderer = this.layerRenderers[key];
+    delete this.layerRenderers[key];
+    return layerRenderer;
+  } else {
+    return null;
+  }
 };