S1162 Add tag error-handling