Added protection around packetclass calls - Part1