diff --git a/app/src/main/java/org/mosad/teapod/MainActivity.kt b/app/src/main/java/org/mosad/teapod/MainActivity.kt
index 2b7a72f..8b9a1e6 100644
--- a/app/src/main/java/org/mosad/teapod/MainActivity.kt
+++ b/app/src/main/java/org/mosad/teapod/MainActivity.kt
@@ -121,7 +121,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
         val time = measureTimeMillis {
             Preferences.load(this)
 
-            // make sure credentials are set
+            // make sure credentials are set, run's async
             EncryptedPreferences.readCredentials(this)
             if (EncryptedPreferences.password.isEmpty()) {
                 showLoginDialog(true)
diff --git a/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt b/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
index b8bc8c1..c63ed15 100644
--- a/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
@@ -51,16 +51,18 @@ class HomeFragment : Fragment() {
     }
 
     private fun initHighlight() {
-        highlightMedia =  AoDParser.highlightsList[0]
+        if (AoDParser.highlightsList.isNotEmpty()) {
+            highlightMedia =  AoDParser.highlightsList[0]
 
-        binding.textHighlightTitle.text = highlightMedia.title
-        Glide.with(requireContext()).load(highlightMedia.posterUrl)
-            .into(binding.imageHighlight)
+            binding.textHighlightTitle.text = highlightMedia.title
+            Glide.with(requireContext()).load(highlightMedia.posterUrl)
+                .into(binding.imageHighlight)
 
-        if (StorageController.myList.contains(highlightMedia.id)) {
-            loadIntoCompoundDrawable(R.drawable.ic_baseline_check_24, binding.textHighlightMyList)
-        } else {
-            loadIntoCompoundDrawable(R.drawable.ic_baseline_add_24, binding.textHighlightMyList)
+            if (StorageController.myList.contains(highlightMedia.id)) {
+                loadIntoCompoundDrawable(R.drawable.ic_baseline_check_24, binding.textHighlightMyList)
+            } else {
+                loadIntoCompoundDrawable(R.drawable.ic_baseline_add_24, binding.textHighlightMyList)
+            }
         }
     }