Fix null pointer issue when attrs are not supplied to withTag
Merge branch '2.2.x'