fix(scrollable): check if scrollable exists before unregistering (#3050)

angular · Feb 16, 2017 · b358c6c · b358c6c
1 parent a91ae72
commit b358c6c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/lib/core/overlay/scroll/scroll-dispatcher.ts b/src/lib/core/overlay/scroll/scroll-dispatcher.ts
@@ -34,7 +34,6 @@ export class ScrollDispatcher {
   /**
    * Registers a Scrollable with the service and listens for its scrolled events. When the
    * scrollable is scrolled, the service emits the event in its scrolled observable.
-   *
    * @param scrollable Scrollable instance to be registered.
    */
   register(scrollable: Scrollable): void {
@@ -44,12 +43,13 @@ export class ScrollDispatcher {
 
   /**
    * Deregisters a Scrollable reference and unsubscribes from its scroll event observable.
-   *
    * @param scrollable Scrollable instance to be deregistered.
    */
   deregister(scrollable: Scrollable): void {
-    this.scrollableReferences.get(scrollable).unsubscribe();
-    this.scrollableReferences.delete(scrollable);
+    if (this.scrollableReferences.has(scrollable)) {
+      this.scrollableReferences.get(scrollable).unsubscribe();
+      this.scrollableReferences.delete(scrollable);
+    }
   }
 
   /**