diff --git a/etl/route_march/oo_prs_additional_units/oo_prs_additional_units.py b/etl/route_march/oo_prs_additional_units/oo_prs_additional_units.py
index 69e08f9a..2c63a788 100644
--- a/etl/route_march/oo_prs_additional_units/oo_prs_additional_units.py
+++ b/etl/route_march/oo_prs_additional_units/oo_prs_additional_units.py
@@ -75,9 +75,12 @@ SOCIAL_TENURES = ["Rented (social)", "rental (social)"]
 
 
 def process_postcode_epcs(postcode, client):
-    params = {"postcode": postcode}
+    params = {"postcode": postcode.rstrip().lstrip()}
     url = os.path.join(client.domestic.host, "search") + "?" + urlencode({"size": 1000})
     response = client.domestic.call(method="get", url=url, params=params)
+    if "rows" not in response:
+        logger.warning("No EPCs found for postcode %s", postcode)
+        return pd.DataFrame()
     postcode_epcs = pd.DataFrame(response["rows"])
 
     # Processing code here
@@ -191,6 +194,8 @@ def main():
         epcs = []
         for postcode in tqdm(postcodes):
             postcode_epcs = process_postcode_epcs(postcode, client)
+            if postcode_epcs.empty:
+                continue
             epcs.append(postcode_epcs)
 
         # Concatenate all postcodes' data and filter it