fix docblocks and exceptions messages