[minor] Better validation