review comments :
 - include type value in exception message
 - fix javadoc.