From cb89795b4cb78ba86fa43b40333557cebeb27413 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 16 Jan 2020 16:17:36 -0500
Subject: [PATCH] remove !

---
 MVMCoreUI/Organisms/Stack.swift | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/MVMCoreUI/Organisms/Stack.swift b/MVMCoreUI/Organisms/Stack.swift
index 29f9cd9f..0fc1ca8f 100644
--- a/MVMCoreUI/Organisms/Stack.swift
+++ b/MVMCoreUI/Organisms/Stack.swift
@@ -107,12 +107,11 @@ open class Stack<T>: Container where T: StackModelProtocol {
     }
     
     open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        if model == nil {
-            let data = try! JSONSerialization.data(withJSONObject: json!)
-            let decoder = JSONDecoder()
-            let model = try! decoder.decode(MoleculeStackModel.self, from: data)
+        if let model = model {
             setWithModel(model, delegateObject, additionalData)
-        } else {
+        } else if let json = json,
+            let data = try? JSONSerialization.data(withJSONObject: json),
+            let model = try? JSONDecoder().decode(MoleculeStackModel.self, from: data) {
             setWithModel(model, delegateObject, additionalData)
         }
     }
@@ -182,7 +181,7 @@ open class Stack<T>: Container where T: StackModelProtocol {
     
     /// Adds the stack item view
     func addView(_ view: UIView,_ model: StackItemModelProtocol, lastItem: Bool) {
-        let stackModel = self.stackModel!
+        guard let stackModel = self.stackModel else { return }
         guard !model.gone else {
             // Gone views do not show
             stackItems.append(view)