diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 0c7c4d94c..10d12df3a 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -1032,8 +1032,8 @@ class PlayerFragment : Fragment() {
 
         for (vid in response.videoStreams!!) {
             // append quality to list if it has the preferred format (e.g. MPEG)
-            if (vid.format.equals(videoFormatPreference)) { // preferred format
-                videosNameArray += vid.quality!!
+            if (vid.format.equals(videoFormatPreference) && vid.url != null) { // preferred format
+                videosNameArray += vid.quality.toString()
                 videosUrlArray += vid.url!!.toUri()
             } else if (vid.quality.equals("LBRY") && vid.format.equals("MP4")) { // LBRY MP4 format)
                 videosNameArray += "LBRY MP4"
diff --git a/app/src/main/res/layout/exo_styled_player_control_view.xml b/app/src/main/res/layout/exo_styled_player_control_view.xml
index 95ff00180..9aec943b4 100644
--- a/app/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/app/src/main/res/layout/exo_styled_player_control_view.xml
@@ -30,7 +30,7 @@
                 android:id="@+id/close_imageButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:background="#00FFFFFF"
                 android:padding="@dimen/exo_icon_padding"
                 android:src="@drawable/ic_close"