Improve key_sync checks in key handler