diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
index e73992e0f..01cbdf665 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
@@ -281,12 +281,13 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
             return gestureDetector.onTouchEvent(event)
         }
 
+        @Suppress("Deprecation")
         private fun vibrate() {
             val v = requireContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator?
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                v!!.vibrate(VibrationEffect.createOneShot(10, VibrationEffect.DEFAULT_AMPLITUDE))
+                v?.vibrate(VibrationEffect.createOneShot(10, VibrationEffect.DEFAULT_AMPLITUDE))
             } else {
-                v!!.vibrate(10)
+                v?.vibrate(10)
             }
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
index fed9d305f..52ef392d0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
@@ -92,7 +92,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener {
         ViewCompat.setOnApplyWindowInsetsListener(
             requireActivity().rootView
         ) { _, insets ->
-            binding.container.updatePadding(bottom = insets.safeGetBottomInsets())
+            _binding?.container?.updatePadding(bottom = insets.safeGetBottomInsets())
             insets
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
index 6a0d5c47b..f03863f61 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
@@ -28,6 +28,7 @@ object ThemeManager {
     fun getNightMode(
         context: Context
     ): Int = when (context.generalThemeValue) {
+        LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
         DARK -> AppCompatDelegate.MODE_NIGHT_YES
         BLACK -> {
             if (PreferenceUtil.baseTheme == "dark") {