diff --git a/src/hls-adapter.js b/src/hls-adapter.js
index caf47fc0..218d234c 100644
--- a/src/hls-adapter.js
+++ b/src/hls-adapter.js
@@ -3,13 +3,13 @@ import Hlsjs from 'hls.js';
 import DefaultConfig from './default-config';
 import {type ErrorDetailsType, HlsJsErrorMap} from './errors';
 import {AudioTrack, BaseMediaSourceAdapter, Env, Error, EventType, TextTrack, Track, Utils, VideoTrack} from 'playkit-js';
-import pLoader from './jsonp-ploader';
+import {pLoader} from './jsonp-ploader';
 
 /**
  * Adapter of hls.js lib for hls content.
  * @classdesc
  */
-export default class HlsAdapter extends BaseMediaSourceAdapter {
+class HlsAdapter extends BaseMediaSourceAdapter {
   /**
    * The id of the adapter.
    * @member {string} id
@@ -597,7 +597,7 @@ export default class HlsAdapter extends BaseMediaSourceAdapter {
     try {
       this._videoElement.currentTime = this._getLiveEdge();
     } catch (e) {
-      return;
+      this.logger.warn('Seek to live edge failed', e);
     }
   }
 
@@ -844,3 +844,5 @@ export default class HlsAdapter extends BaseMediaSourceAdapter {
     }
   }
 }
+
+export {HlsAdapter};
diff --git a/src/index.js b/src/index.js
index de2a092b..b359e0b5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,11 +1,11 @@
 // @flow
 import {registerMediaSourceAdapter} from 'playkit-js';
-import HlsAdapter from './hls-adapter';
+import {HlsAdapter} from './hls-adapter';
 
 declare var __VERSION__: string;
 declare var __NAME__: string;
 
-export default HlsAdapter;
+export {HlsAdapter as Adapter};
 export {__VERSION__ as VERSION, __NAME__ as NAME};
 
 // Register hls adapter to the media source adapter provider.
diff --git a/src/jsonp-ploader.js b/src/jsonp-ploader.js
index 3f2bb59a..c89eb368 100644
--- a/src/jsonp-ploader.js
+++ b/src/jsonp-ploader.js
@@ -7,7 +7,7 @@ import Hlsjs from 'hls.js';
  * It checks if it should use jsonp for the manifest first, else - the regular
  * loader is called.
  */
-export default class pLoader extends Hlsjs.DefaultConfig.loader {
+class pLoader extends Hlsjs.DefaultConfig.loader {
   /**
    * redirect external stream handler function
    * @param {string} uri - the original uri
@@ -41,3 +41,5 @@ export default class pLoader extends Hlsjs.DefaultConfig.loader {
     };
   }
 }
+
+export {pLoader};
diff --git a/test/src/hls-adapter.spec.js b/test/src/hls-adapter.spec.js
index a553378a..44fb7d83 100644
--- a/test/src/hls-adapter.spec.js
+++ b/test/src/hls-adapter.spec.js
@@ -1,11 +1,9 @@
-import loadPlayer from 'playkit-js';
-import {VideoTrack, AudioTrack, TextTrack} from 'playkit-js';
+import loadPlayer, {AudioTrack, EventType, TextTrack, VideoTrack} from 'playkit-js';
 import * as TestUtils from 'playkit-js/test/src/utils/test-utils';
-import HlsAdapter from '../../src';
+import {HlsAdapter} from '../../src/hls-adapter';
 import * as hls_sources from './json/hls_sources.json';
 import * as hls_tracks from './json/hls_tracks.json';
 import * as player_tracks from './json/player_tracks.json';
-import {EventType} from 'playkit-js';
 
 const targetId = 'player-placeholder_hls-adapter.spec';