diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
index ff9da6d5..421c2e95 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
@@ -87,7 +87,7 @@ open class Carousel: View {
         showPeaking(false)
         
         // Go to current cell. layoutIfNeeded is needed otherwise cellForItem returns nil for peaking logic. The dispatch is a sad way to ensure the collection view is ready to be scrolled.
-        guard let model = model as? CarouselModel,
+        guard let model = model as? CarouselModel, !model.molecules.isEmpty,
               (model.paging == true || loop == true) else { return }
         DispatchQueue.main.async {
             self.collectionView.scrollToItem(at: IndexPath(row: self.currentIndex, section: 0), at: self.itemAlignment, animated: false)
diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift
index c18f0e95..976018dd 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel/CarouselModel.swift
@@ -8,7 +8,6 @@
 
 import UIKit
 
-
 @objcMembers public class CarouselModel: ParentMoleculeModelProtocol, FormFieldProtocol {
     
     //--------------------------------------------------
@@ -57,14 +56,14 @@ import UIKit
         
         guard selectable else {
             // Use visible item value, else index
-            if let fieldValue = molecules[index].formFieldValue() {
+            if let fieldValue = molecules[safe: index]?.formFieldValue() {
                 return fieldValue
             }
             return index
         }
         // Use selected item value, else index
         guard let selectedIndex = selectedIndex else { return nil }
-        guard let fieldValue = molecules[selectedIndex].formFieldValue() else { return selectedIndex }
+        guard let fieldValue = molecules[safe: selectedIndex]?.formFieldValue() else { return selectedIndex }
         return fieldValue
     }