diff --git a/ballista/scheduler/src/cluster/kv.rs b/ballista/scheduler/src/cluster/kv.rs
index 25bb8e754..58e56d9e9 100644
--- a/ballista/scheduler/src/cluster/kv.rs
+++ b/ballista/scheduler/src/cluster/kv.rs
@@ -429,6 +429,12 @@ impl<S: KeyValueStore, T: 'static + AsLogicalPlan, U: 'static + AsExecutionPlan>
             metadata.value().clone()
         } else {
             let value = self.store.get(Keyspace::Executors, executor_id).await?;
+            if value.is_empty() {
+                return Err(BallistaError::Internal(format!(
+                    "Executor {} not registered",
+                    executor_id
+                )));
+            }
             let decoded =
                 decode_into::<protobuf::ExecutorMetadata, ExecutorMetadata>(&value)?;
             self.executors