Add try catch on add error
Fix monitor