Added missing error message
Merge branch 'merge-inline-annotation'