diff --git a/package.json b/package.json
index 6f5959ec..79f1379b 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "mocha": "^3.2.0",
     "mocha-cli": "^1.0.1",
     "playkit-js": "https://github.com/kaltura/playkit-js.git#master",
-    "playkit-js-providers": "https://github.com/kaltura/playkit-js-providers.git#analytics-service",
+    "playkit-js-providers": "https://github.com/kaltura/playkit-js-providers.git#master",
     "pre-push": "^0.1.1",
     "prettier": "^1.13.5",
     "sinon": "^2.0.0",
@@ -83,7 +83,7 @@
   },
   "peerDependencies": {
     "playkit-js": "https://github.com/kaltura/playkit-js.git#master",
-    "playkit-js-providers": "https://github.com/kaltura/playkit-js-providers.git#analytics-service"
+    "playkit-js-providers": "https://github.com/kaltura/playkit-js-providers.git#master"
   },
   "keywords": [],
   "license": "AGPL-3.0",
diff --git a/src/kava.js b/src/kava.js
index 480a004b..e34c55c6 100644
--- a/src/kava.js
+++ b/src/kava.js
@@ -203,7 +203,9 @@ export default class Kava extends BasePlugin {
     const rates = this._getRates();
     const activeTracks = this.player.getActiveTracks();
     this._rateHandler.setRates(rates);
-    this._rateHandler.setCurrent(activeTracks.video.bandwidth);
+    if (activeTracks.video) {
+      this._rateHandler.setCurrent(activeTracks.video.bandwidth);
+    }
     if (activeTracks.audio) {
       this._model.updateModel({language: activeTracks.audio.language});
     }
@@ -319,9 +321,9 @@ export default class Kava extends BasePlugin {
   }
 
   _onError(event: FakeEvent): void {
-    this._model.updateModel({errorCode: event.payload.code});
-    this._sendAnalytics(KavaEventModel.ERROR);
     if (event.payload && event.payload.severity === PKError.Severity.CRITICAL) {
+      this._model.updateModel({errorCode: event.payload.code});
+      this._sendAnalytics(KavaEventModel.ERROR);
       this.reset();
     }
   }