diff --git a/db/system_keyspace.cc b/db/system_keyspace.cc
index 9ca334b49d..4bc8f25c4a 100644
--- a/db/system_keyspace.cc
+++ b/db/system_keyspace.cc
@@ -1874,6 +1874,12 @@ static data_value_or_unset make_data_value_or_unset(const std::optional<std::uno
 }
 
 future<> system_keyspace::update_peer_info(gms::inet_address ep, locator::host_id hid, const peer_info& info) {
+    if (ep == gms::inet_address{}) {
+        on_internal_error(slogger, format("update_peer_info called with empty inet_address, host_id {}", hid));
+    }
+    if (!hid) {
+        on_internal_error(slogger, format("update_peer_info called with empty host_id, ep {}", ep));
+    }
     if (_db.get_token_metadata().get_topology().is_me(ep)) {
         on_internal_error(slogger, format("update_peer_info called for this node: {}", ep));
     }