Merge 88d4953 into e7f43d3

src/main/java/seedu/address/storage/XmlAdaptedPerson.java

@@ -78,22 +78,22 @@ public Person toModelType() throws IllegalValueException {
             personTags.add(tag.toModelType());
         }
 
-        if (!Name.isValidName(this.name)) {
+        if (this.name != null && !Name.isValidName(this.name)) {
             throw new IllegalValueException(Name.MESSAGE_NAME_CONSTRAINTS);
         }
         final Name name = new Name(this.name);
 
-        if (!Phone.isValidPhone(this.phone)) {
+        if (this.phone != null && !Phone.isValidPhone(this.phone)) {
             throw new IllegalValueException(Phone.MESSAGE_PHONE_CONSTRAINTS);
         }
         final Phone phone = new Phone(this.phone);
 
-        if (!Email.isValidEmail(this.email)) {
+        if (this.email != null && !Email.isValidEmail(this.email)) {
             throw new IllegalValueException(Email.MESSAGE_EMAIL_CONSTRAINTS);
         }
         final Email email = new Email(this.email);
 
-        if (!Address.isValidAddress(this.address)) {
+        if (this.address != null && !Address.isValidAddress(this.address)) {
             throw new IllegalValueException(Address.MESSAGE_ADDRESS_CONSTRAINTS);
         }
         final Address address = new Address(this.address);

src/main/java/seedu/address/storage/XmlSerializableAddressBook.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -53,7 +54,7 @@ public ObservableList<Person> getPersonList() {
                 //TODO: better error handling
                 return null;
             }
-        }).collect(Collectors.toCollection(FXCollections::observableArrayList));
+        }).filter(Objects::nonNull).collect(Collectors.toCollection(FXCollections::observableArrayList));
         return FXCollections.unmodifiableObservableList(persons);
     }