Added empty check against comment targets