Better validation for the outbox