improving invlid id fault tolerance