diff --git a/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift
index 943f53ad..22ec9bcd 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift
@@ -108,8 +108,7 @@ extension TabsListItemModel: AddMolecules {
     public func moleculesToAdd() -> AddMolecules.AddParameters? {
         guard addedMolecules == nil else { return nil }
         let index = tabs.selectedIndex
-        guard molecules.count >= index else { return nil }
-        let addedMolecules = molecules[index]
+        guard let addedMolecules = molecules[safe: index] else { return nil }
         self.addedMolecules = addedMolecules
         return (addedMolecules, .below)
     }
diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
index 3ef117da..fc79b5bd 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
@@ -361,7 +361,7 @@ open class Carousel: View {
     }
     
     func trackSwipeActionAnalyticsforIndex(_ index : Int){
-        guard let itemModel = molecules?[index],
+        guard let itemModel = molecules?[safe:index],
               let viewControllerObject = delegateObject?.moleculeDelegate as? MVMCoreViewControllerProtocol else { return }
         MVMCoreUILoggingHandler.shared()?.defaultLogAction(forController: viewControllerObject, actionInformation: itemModel.toJSON(), additionalData: nil)
     }