Does the Grace Period Apply to Non-B Visa Extensions in Thailand?

Have a quick question. My Non- B visa is up on the 4th of June and I have my work permit renewed for the next year. The company that I work for are under the idea that they don't have to make a new visa for me until after the end of the grace period as mentioned for the tourist visas. Does this grace period include Non-B's?? My impression is that it doesn't include Non-B's and that we have to extend them as normal but the team here are insisting that the grace period also includes mine.. What do you think/ know?