diff --git a/grin/src/sync.rs b/grin/src/sync.rs
index cbe6e779..ea75a471 100644
--- a/grin/src/sync.rs
+++ b/grin/src/sync.rs
@@ -283,14 +283,11 @@ impl Syncer {
 
 		let locator = heights
 			.into_iter()
-			.map(|h| {
-				let header = self.chain.get_header_by_height(h).unwrap();
-				header.hash()
-			})
+			.map(|h| self.chain.get_header_by_height(h))
+			.filter(|h| h.is_ok())
+			.map(|h| h.unwrap().hash())
 			.collect();
-
 		debug!(LOGGER, "Sync: locator: {:?}", locator);
-
 		Ok(locator)
 	}