Typo in Javadoc
Fixed message resolution
Fixed message resolution when none of the attributes is used