diff --git a/src/models/actions/create/CreateDonor.ts b/src/models/actions/create/CreateDonor.ts
index a99d139..5143a2c 100644
--- a/src/models/actions/create/CreateDonor.ts
+++ b/src/models/actions/create/CreateDonor.ts
@@ -29,7 +29,7 @@ export class CreateDonor extends CreateParticipant {
         newDonor.receiptNeeded = this.receiptNeeded;
         newDonor.address = this.address;
 
-        if (this.receiptNeeded == true && this.address == null) {
+        if (this.receiptNeeded == true && this.address.isValidAddress == false) {
             throw new DonorReceiptAddressNeededError()
         }
 
diff --git a/src/models/entities/Address.ts b/src/models/entities/Address.ts
index ed0d624..9ccc026 100644
--- a/src/models/entities/Address.ts
+++ b/src/models/entities/Address.ts
@@ -57,9 +57,10 @@ export class Address {
   country: string;
 
   /**
-   * Turns this entity into it's response class.
+   * Checks if this is a valid address
    */
-  public toResponse() {
-    return new Error("NotImplemented");
+  public get isValidAddress(): Boolean {
+    if (!this.address1 || !this.city || !this.country || !this.postalcode) { return false; }
+    return true;
   }
 }