diff --git a/iOS/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents b/iOS/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents
index a88b97f..7639324 100644
--- a/iOS/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents
+++ b/iOS/MonsterCards/MonsterCards.xcdatamodeld/MonsterCards.xcdatamodel/contents
@@ -2,7 +2,7 @@
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17192" systemVersion="19H2" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
     <entity name="Monster" representedClassName="Monster" syncable="YES" codeGenerationType="category">
         <attribute name="alignment" attributeType="String" defaultValueString=""/>
-        <attribute name="armorType" attributeType="String" defaultValueString=""/>
+        <attribute name="armorType" attributeType="String" defaultValueString="none"/>
         <attribute name="baseSpeed" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="burrowSpeed" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="canHover" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
diff --git a/iOS/MonsterCards/Views/FormFields/MCSelectFieldTableViewCell.m b/iOS/MonsterCards/Views/FormFields/MCSelectFieldTableViewCell.m
index 8afc065..e0e4b7e 100644
--- a/iOS/MonsterCards/Views/FormFields/MCSelectFieldTableViewCell.m
+++ b/iOS/MonsterCards/Views/FormFields/MCSelectFieldTableViewCell.m
@@ -38,9 +38,14 @@
 
 -(void)updateView {
     self.textField.text = _selectedChoice.label;
-    NSInteger selectedRow = [_choices indexOfObject:_selectedChoice];
-    [self.pickerView selectRow:selectedRow inComponent:0 animated:YES];
-    
+    if (_choices && _choices.count > 0) {
+        NSInteger selectedRow = [_choices indexOfObject:_selectedChoice];
+        if (selectedRow != NSNotFound) {
+            [self.pickerView selectRow:selectedRow inComponent:0 animated:YES];
+        } else {
+            [self.pickerView selectRow:0 inComponent:0 animated:YES];
+        }
+    }
 }
 
 @synthesize choices = _choices;
@@ -90,7 +95,8 @@
     if (!_choices) {
         newValue = value;
     } else if (!foundChoice) {
-        newValue = nil;
+        foundChoice = [_choices firstObject];
+        newValue = foundChoice.value;
     } else {
         newValue = foundChoice.value;
     }