diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index 26310021..f362e595 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -54,7 +54,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     }
     
     open override func shouldFinishProcessingLoad(_ loadObject: MVMCoreLoadObject, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject>) -> Bool {
-        let shouldFinish = super.shouldFinishProcessingLoad(loadObject, error: error)
+        guard super.shouldFinishProcessingLoad(loadObject, error: error) else { return false }
         // This template requires atleast one of the three layers.
         if templateModel?.header == nil,
             templateModel?.molecules?.count ?? 0 == 0,
@@ -63,7 +63,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
             error.pointee = errorObject
             return false
         }
-        return shouldFinish
+        return true
     }
     
     open override func newDataBuildScreen() {