Added missing error message
Merge branch 'maven-v20141120-merge-inline-annotation' into maven-v20141120