[minor] Better has checks