Merge c4a8bc0 into c4a84cc

ReactiveX · Feb 18, 2019 · 5cc7893 · 5cc7893
2 parents c4a84cc + c4a8bc0
commit 5cc7893
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/internal/Subscription.ts b/src/internal/Subscription.ts
@@ -130,6 +130,11 @@ export class Subscription implements SubscriptionLike {
    */
   add(teardown: TeardownLogic): Subscription {
     let subscription = (<Subscription>teardown);
+
+    if (!(<any>teardown)) {
+      return Subscription.EMPTY;
+    }
+
     switch (typeof teardown) {
       case 'function':
         subscription = new Subscription(<(() => void)>teardown);
@@ -147,9 +152,6 @@ export class Subscription implements SubscriptionLike {
         }
         break;
       default: {
-        if (!(<any>teardown)) {
-          return Subscription.EMPTY;
-        }
         throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.');
       }
     }