diff --git a/src/main/java/seedu/address/ui/ClientCard.java b/src/main/java/seedu/address/ui/ClientCard.java
index f8f7214935e..4a6b3164481 100644
--- a/src/main/java/seedu/address/ui/ClientCard.java
+++ b/src/main/java/seedu/address/ui/ClientCard.java
@@ -5,6 +5,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
 import seedu.address.model.client.Client;
+import seedu.address.model.client.Email;
 
 /**
  * An UI component that displays information of a {@code Client}.
@@ -45,7 +46,7 @@ public ClientCard(Client client, int displayedIndex) {
         id.setText(displayedIndex + "");
         name.setText(client.getName().fullName);
         phone.setText(client.getPhone().value);
-        email.setText(client.getEmail().get().toString());
+        email.setText(client.getEmail().map(Email::toString).orElse(""));
         String productStr = client.getProducts().toString();
         products.setText(productStr.substring(1, productStr.length() - 1));
     }