Changed the addTags

The method is supposed to be fault tolerant now