diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java
index b9e3c490..61dce9d6 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java
@@ -104,7 +104,7 @@ public class BookmarksFragment extends Fragment {
                     {
                         if (entry.isVideo())
                         {
-                            videoPlayer.getValue().playVideo(entry);
+                            videoPlayer.getValue().playVideo(getContext(), entry);
                         }
                         else
                         {
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.java
index c4f6040c..53882d68 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.java
@@ -576,7 +576,7 @@ public class SearchFragment extends Fragment {
 
     private void onVideoSelected(MusicDirectory.Entry entry)
     {
-        videoPlayer.getValue().playVideo(entry);
+        videoPlayer.getValue().playVideo(getContext(), entry);
     }
 
     private void autoplay()
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt
index 06e01df4..7977cc82 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt
@@ -85,6 +85,6 @@ val musicServiceModule = module {
 
     single { DownloadHandler(get(), get()) }
     single { NetworkAndStorageChecker(androidContext()) }
-    single { VideoPlayer(androidContext()) }
+    single { VideoPlayer() }
     single { ShareHandler(androidContext()) }
 }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt
index 4c96c1c6..515c3389 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt
@@ -134,7 +134,7 @@ class SelectAlbumFragment : Fragment() {
                             bundle
                         )
                     } else if (entry != null && entry.isVideo) {
-                        videoPlayer.playVideo(entry)
+                        videoPlayer.playVideo(requireContext(), entry)
                     } else {
                         enableButtons()
                     }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
index 88646466..6e5e1daf 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
@@ -649,7 +649,7 @@ open class RESTMusicService(
             "Get-Video-Url"
         ).start()
 
-        latch.await(3, TimeUnit.SECONDS)
+        latch.await(5, TimeUnit.SECONDS)
 
         return expectedResult[0]!!
     }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt
index 113ba68a..9a988300 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt
@@ -8,8 +8,8 @@ import org.moire.ultrasonic.util.Util
 /**
  * This utility class helps starting video playback
  */
-class VideoPlayer(val context: Context) {
-    fun playVideo(entry: MusicDirectory.Entry?) {
+class VideoPlayer() {
+    fun playVideo(context: Context, entry: MusicDirectory.Entry?) {
         if (!Util.isNetworkConnected(context)) {
             Util.toast(context, R.string.select_album_no_network)
             return
@@ -18,7 +18,7 @@ class VideoPlayer(val context: Context) {
         try {
             player.playVideo(context, entry)
         } catch (e: Exception) {
-            Util.toast(context, e.message, false)
+            Util.toast(context, e.toString(), false)
         }
     }
 }