diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 4f97b5b79..02deb716f 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 2,
+      "versionName": "0.2",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt
index 8bf188e7d..a0dc61bd3 100644
--- a/app/src/main/java/com/github/libretube/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/MainActivity.kt
@@ -22,6 +22,7 @@ import androidx.navigation.ui.NavigationUI.onNavDestinationSelected
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.material.color.DynamicColors
+import java.lang.Exception
 
 class MainActivity : AppCompatActivity() {
     lateinit var bottomNavigationView: BottomNavigationView
@@ -72,15 +73,23 @@ class MainActivity : AppCompatActivity() {
     }
 
     override fun onBackPressed() {
-        val mainMotionLayout = findViewById<MotionLayout>(R.id.mainMotionLayout)
-        if (mainMotionLayout.progress == 0.toFloat()){
-            mainMotionLayout.transitionToEnd()
-            findViewById<MotionLayout>(R.id.playerMotionLayout).transitionToEnd()
-        }else{
-        navController.popBackStack()
-        if (navController.currentBackStackEntry == null){
-            finish()
-        }}
+        try{
+            val mainMotionLayout = findViewById<MotionLayout>(R.id.mainMotionLayout)
+            if (mainMotionLayout.progress == 0.toFloat()){
+                mainMotionLayout.transitionToEnd()
+                findViewById<MotionLayout>(R.id.playerMotionLayout).transitionToEnd()
+            }else{
+                navController.popBackStack()
+                if (navController.currentBackStackEntry == null){
+                    finish()
+                }}
+        }catch (e: Exception){
+            navController.popBackStack()
+            if (navController.currentBackStackEntry == null){
+                finish()
+            }
+        }
+
 
     }
 
diff --git a/app/src/main/java/com/github/libretube/RetrofitInstance.kt b/app/src/main/java/com/github/libretube/RetrofitInstance.kt
index 732b9b718..6ec8380dd 100644
--- a/app/src/main/java/com/github/libretube/RetrofitInstance.kt
+++ b/app/src/main/java/com/github/libretube/RetrofitInstance.kt
@@ -6,7 +6,7 @@ import retrofit2.converter.jackson.JacksonConverterFactory
 object RetrofitInstance {
     val api: PipedApi by lazy {
         Retrofit.Builder()
-            .baseUrl("https://pipedapi.tokhmi.xyz/")
+            .baseUrl("https://pipedapi.kavin.rocks/")
             .addConverterFactory(JacksonConverterFactory.create())
             .build()
             .create(PipedApi::class.java)