diff --git a/AUTHORS b/AUTHORS
index 68f95f3f49..0967029995 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,6 +43,7 @@ Johan Sundström <oyasumi@gmail.com>
 Jonas Birmé <jonas.birme@eyevinn.se>
 Jozef Chúťka <jozefchutka@gmail.com>
 Jun Hong Chong <chongjunhong@gmail.com>
+Jürgen Kartnaller <kartnaller@lovelysystems.com>
 JW Player <*@jwplayer.com>
 Lucas Gabriel Sánchez <unkiwii@gmail.com>
 Matthias Van Parijs <matvp91@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a11413fd7d..29adac99d2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -70,6 +70,7 @@ Jono Ward <jonoward@gmail.com>
 Jozef Chúťka <jozefchutka@gmail.com>
 Julian Domingo <juliandomingo@google.com>
 Jun Hong Chong <chongjunhong@gmail.com>
+Jürgen Kartnaller <kartnaller@lovelysystems.com>
 Leandro Ribeiro Moreira <leandro.ribeiro.moreira@gmail.com>
 Lucas Gabriel Sánchez <unkiwii@gmail.com>
 Matias Russitto <russitto@gmail.com>
diff --git a/lib/ads/client_side_ad_manager.js b/lib/ads/client_side_ad_manager.js
index c24e528101..612ae97d26 100644
--- a/lib/ads/client_side_ad_manager.js
+++ b/lib/ads/client_side_ad_manager.js
@@ -427,7 +427,7 @@ shaka.ads.ClientSideAdManager = class {
   onAdComplete_(e) {
     this.onEvent_(new shaka.util.FakeEvent(shaka.ads.AdManager.AD_STOPPED,
         (new Map()).set('originalEvent', e)));
-    if (this.ad_.isLinear()) {
+    if (this.ad_ && this.ad_.isLinear()) {
       this.adContainer_.removeAttribute('ad-active');
       this.video_.play();
     }