diff --git a/MVMCoreUI/Atoms/Views/MFView.h b/MVMCoreUI/Atoms/Views/MFView.h
index 243408ac..5e32ff0a 100644
--- a/MVMCoreUI/Atoms/Views/MFView.h
+++ b/MVMCoreUI/Atoms/Views/MFView.h
@@ -10,11 +10,8 @@
 #import <MVMCoreUI/MVMCoreUIMoleculeViewProtocol.h>
 @import MVMCore.MVMCoreViewProtocol;
 
-@class FormValidator;
-
 @interface MFView : UIView <MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol>
 
-//@property (nullable, strong, nonatomic) FormValidator *formValidator;
 @property (nullable, nonatomic, strong) NSDictionary *json;
 
 // Called in the initialization functions. Can setup ui here.
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m
index ff46aa6a..76f2d0f6 100644
--- a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m
+++ b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m
@@ -60,7 +60,11 @@ static const CGFloat CheckBoxHeightWidth = 18.0;
 
 - (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
     
-    [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+    if ([delegateObject isKindOfClass:[MVMCoreUIDelegateObject class]]) {
+        [FormValidator setupValidationWithMolecule:self delegate:((MVMCoreUIDelegateObject *)delegateObject).formValidationProtocol];
+    }
+    
+    
     self.delegate = delegateObject;
     self.fieldKey = [json stringForKey:KeyFieldKey];
     self.isRequired = [json boolForKey:KeyRequired];